Skip to content

Commit 6109f9c

Browse files
MinyazevRMinyazevR
committed
Remove the display widget emulator
1 parent be09658 commit 6109f9c

10 files changed

Lines changed: 63 additions & 62 deletions

File tree

‎.gitmodules‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
[submodule "plugins/robots/thirdparty/trikRuntime"]
22
path = plugins/robots/thirdparty/trikRuntime/trikRuntime
3-
url = https://github.com/trikset/trikRuntime
4-
branch = master
3+
url = https://github.com/MinyazevR/trikRuntime
54
[submodule "qrtest/thirdparty/googletest/googletest"]
65
path = qrtest/thirdparty/googletest/googletest
76
url = https://github.com/google/googletest

‎buildScripts/github/install.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ XCODE_VERSION=${XCODE_VERSION:-15.3}
66
SCRIPT_DIR="$(dirname "$(realpath "${BASH_SOURCE[0]}")")"
77

88
source "$SCRIPT_DIR/utilities.sh"
9-
qt_archives=("qtbase" "qtmultimedia" "qtsvg" "qtscript" "qttools" "qtserialport" "qtimageformats" "qtdeclarative" "qtquickcontrols2" "qttranslations")
9+
qt_archives=("qtbase" "qtmultimedia" "qtsvg" "qtscript" "qttools" "qtserialport" "qtimageformats" "qtdeclarative" "qttranslations")
1010
qt_modules=("qtscript")
1111
case "$(uname)" in
1212
Darwin)
@@ -50,8 +50,8 @@ case "$(uname)" in
5050
qt5-multimedia-devel qt5-svg-devel qt5-script-devel qt5-tools qt5-serialport-devel
5151
elif [ "$ID" = "ubuntu" ]; then
5252
sudo apt-get update && sudo apt-get install -y --no-install-recommends ccache curl make bear libusb-1.0-0-dev \
53-
qtscript5-dev qttools5-dev-tools qtmultimedia5-dev libqt5serialport5-dev libqt5svg5-dev qtdeclarative5-dev \
54-
libudev-dev "$TRIK_PYTHON"-dev qtbase5-private-dev qtquickcontrols2-5-dev qtwayland5 libqscintilla2-qt5-dev libquazip5-dev
53+
qtscript5-dev qttools5-dev-tools qtmultimedia5-dev libqt5serialport5-dev libqt5svg5-dev \
54+
libudev-dev "$TRIK_PYTHON"-dev qtbase5-private-dev qtwayland5 libqscintilla2-qt5-dev libquazip5-dev
5555
elif [[ "$ID" = "rocky" || "$ID" = '"rocky"' ]]; then
5656
GCC_VERSION=${GCC_VERSION:-13}
5757
sudo yum update -y && sudo yum install -y --setopt=install_weak_deps=False epel-release
@@ -66,7 +66,7 @@ case "$(uname)" in
6666
echo $INSTALL_INSTALLER_ENVIRONMENT
6767
if [ "$INSTALL_INSTALLER_ENVIRONMENT" != "true" ]; then
6868
sudo yum install -y --setopt=install_weak_deps=False qt5-qtscript-devel qt5-qttools-devel qt5-qtmultimedia-devel qt5-qtserialport-devel \
69-
qt5-qtsvg-devel qt5-qtbase-devel qt5-qtbase-private-devel qt5-qtquickcontrols2 qt5-qtdeclarative-devel qt5-qtwayland
69+
qt5-qtsvg-devel qt5-qtbase-devel qt5-qtbase-private-devel qt5-qtwayland
7070
else
7171
sudo yum install -y --setopt=install_weak_deps=False libX11-xcb libXext libxkbcommon-x11 fontconfig freetype libXrender
7272
#libQt5WaylandCompositor.so.5.15: libQt5Quick.so.5 libQt5Qml.so.5 libQt5QmlModels.so.5

‎plugins/robots/interpreters/trikKitInterpreterCommon/include/trikKitInterpreterCommon/trikEmulation/displaywidgetemu.h‎

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎plugins/robots/interpreters/trikKitInterpreterCommon/include/trikKitInterpreterCommon/trikEmulation/trikdisplayemu.h‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,6 @@ class Display;
3131
class TrikDisplayEmu : public trikControl::DisplayInterface
3232
{
3333
Q_OBJECT
34-
35-
// Hide this strange access function to prevent problems, it violates LoD
36-
// To prevent UB the exception is thrown
37-
trikControl::DisplayWidgetInterface &graphicsWidget() override;
38-
39-
// DisplayInterface interface
4034
public:
4135
explicit TrikDisplayEmu(const QSharedPointer<robotModel::twoD::TrikTwoDRobotModel> &model);
4236
void init();

‎plugins/robots/interpreters/trikKitInterpreterCommon/include/trikKitInterpreterCommon/trikbrick.h‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,17 +48,11 @@ namespace trik {
4848
class TrikBrick final : public trikControl::BrickInterface
4949
{
5050
Q_OBJECT
51-
52-
// BrickInterface interface
5351
public:
54-
TrikBrick(const QSharedPointer<robotModel::twoD::TrikTwoDRobotModel> &model);
52+
explicit TrikBrick(const QSharedPointer<robotModel::twoD::TrikTwoDRobotModel> &model);
5553
~TrikBrick() override;
5654
void reset() override;
57-
QString configVersion() const override {return QString();}
58-
trikControl::DisplayWidgetInterface *graphicsWidget() override {
59-
return nullptr;
60-
}
61-
55+
QString configVersion() const override {return {};}
6256
void init();
6357

6458
void setCurrentDir(const QString &dir);

‎plugins/robots/interpreters/trikKitInterpreterCommon/src/trikEmulation/trikdisplayemu.cpp‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,6 @@ Qt::ConnectionType TrikDisplayEmu::callType() const {
3535
// return thread() != mDisplay->thread()? Qt::BlockingQueuedConnection : Qt::DirectConnection;
3636
}
3737

38-
trikControl::DisplayWidgetInterface &TrikDisplayEmu::graphicsWidget()
39-
{
40-
Q_UNIMPLEMENTED();
41-
throw std::logic_error(__PRETTY_FUNCTION__);
42-
}
43-
4438
void TrikDisplayEmu::init()
4539
{
4640
mDisplay = kitBase::robotModel::RobotModelUtils::findDevice<Display>(*mTwoDRobotModel, "DisplayPort");

‎plugins/robots/interpreters/trikKitInterpreterCommon/trikKitInterpreterCommon.pri‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ HEADERS += \
8080
$$PWD/include/trikKitInterpreterCommon/trikDisplayWidget.h \
8181
$$PWD/include/trikKitInterpreterCommon/trikKitInterpreterPluginBase.h \
8282
$$PWD/include/trikKitInterpreterCommon/trikbrick.h \
83-
$$PWD/include/trikKitInterpreterCommon/trikEmulation/displaywidgetemu.h \
8483
$$PWD/include/trikKitInterpreterCommon/trikEmulation/trikdisplayemu.h \
8584
$$PWD/include/trikKitInterpreterCommon/trikEmulation/triksensoremu.h \
8685
$$PWD/include/trikKitInterpreterCommon/trikEmulation/trikmotoremu.h \

‎plugins/robots/thirdparty/trikRuntime/trikControl.pri‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
TEMPLATE = lib
2+
3+
include($$PWD/trikRuntime/global.pri)
4+
5+
DEFINES += TRIKCONTROL_LIBRARY
6+
7+
TRIK_CONTROL_ROOT = $$PWD/trikRuntime/trikControl
8+
9+
HEADERS += \
10+
$$TRIK_CONTROL_ROOT/include/trikControl/trikControlDeclSpec.h \
11+
$$TRIK_CONTROL_ROOT/include/trikControl/batteryInterface.h \
12+
$$TRIK_CONTROL_ROOT/include/trikControl/brickFactory.h \
13+
$$TRIK_CONTROL_ROOT/include/trikControl/brickInterface.h \
14+
$$TRIK_CONTROL_ROOT/include/trikControl/cameraDeviceInterface.h \
15+
$$TRIK_CONTROL_ROOT/include/trikControl/colorSensorInterface.h \
16+
$$TRIK_CONTROL_ROOT/include/trikControl/deviceInterface.h \
17+
$$TRIK_CONTROL_ROOT/include/trikControl/displayInterface.h \
18+
$$TRIK_CONTROL_ROOT/include/trikControl/encoderInterface.h \
19+
$$TRIK_CONTROL_ROOT/include/trikControl/eventCodeInterface.h \
20+
$$TRIK_CONTROL_ROOT/include/trikControl/eventDeviceInterface.h \
21+
$$TRIK_CONTROL_ROOT/include/trikControl/eventInterface.h \
22+
$$TRIK_CONTROL_ROOT/include/trikControl/fifoInterface.h \
23+
$$TRIK_CONTROL_ROOT/include/trikControl/gamepadInterface.h \
24+
$$TRIK_CONTROL_ROOT/include/trikControl/keysInterface.h \
25+
$$TRIK_CONTROL_ROOT/include/trikControl/ledInterface.h \
26+
$$TRIK_CONTROL_ROOT/include/trikControl/lineSensorInterface.h \
27+
$$TRIK_CONTROL_ROOT/include/trikControl/motorInterface.h \
28+
$$TRIK_CONTROL_ROOT/include/trikControl/objectSensorInterface.h \
29+
$$TRIK_CONTROL_ROOT/include/trikControl/pwmCaptureInterface.h \
30+
$$TRIK_CONTROL_ROOT/include/trikControl/sensorInterface.h \
31+
$$TRIK_CONTROL_ROOT/include/trikControl/soundSensorInterface.h \
32+
$$TRIK_CONTROL_ROOT/include/trikControl/vectorSensorInterface.h \
33+
$$TRIK_CONTROL_ROOT/include/trikControl/gyroSensorInterface.h \
34+
$$TRIK_CONTROL_ROOT/include/trikControl/markerInterface.h \
35+
$$TRIK_CONTROL_ROOT/include/trikControl/i2cDeviceInterface.h \
36+
$$TRIK_CONTROL_ROOT/include/trikControl/utilities.h \
37+
$$TRIK_CONTROL_ROOT/include/trikControl/lidarInterface.h \
38+
$$TRIK_CONTROL_ROOT/include/trikControl/irCameraInterface.h \
39+
$$TRIK_CONTROL_ROOT/src/qtCameraImplementation.h \
40+
$$TRIK_CONTROL_ROOT/src/imitationCameraImplementation.h \
41+
42+
SOURCES += \
43+
$$TRIK_CONTROL_ROOT/src/utilities.cpp \
44+
$$TRIK_CONTROL_ROOT/src/brickInterface.cpp \
45+
$$TRIK_CONTROL_ROOT/src/qtCameraImplementation.cpp \
46+
$$TRIK_CONTROL_ROOT/src/imitationCameraImplementation.cpp \
47+
48+
INCLUDEPATH += \
49+
$$TRIK_CONTROL_ROOT/include/ \
50+
$$TRIK_CONTROL_ROOT/include/trikControl/ \
51+
52+
links(trikKernel)
53+
implementationIncludes(trikKernel)

‎plugins/robots/thirdparty/trikRuntime/trikRuntime‎

Submodule trikRuntime updated 275 files

‎plugins/robots/thirdparty/trikRuntime/trikRuntime.pro‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ TEMPLATE = subdirs
1616
include(../../../../global.pri)
1717

1818
CONFIG += trik_not_brick
19+
CONFIG += exclude_init_internal_types
1920
cache(CONFIG, set)
2021

2122
SUBDIRS += \
@@ -39,12 +40,6 @@ trikRuntime_use_local_qslog {
3940

4041
cache(EXTERNAL_SETTINGS, set stash super)
4142

42-
tests {
43-
SUBDIRS *= tests
44-
tests.depends = trikScriptRunner trikCommunicator trikKernel
45-
tests.subdir = $$PWD/trikRuntime/tests
46-
}
47-
4843
!trik_nopython {
4944
SUBDIRS += PythonQt
5045
trikScriptRunner.depends += PythonQt
@@ -54,7 +49,7 @@ trikScriptRunner.subdir = $$PWD/trikRuntime/trikScriptRunner
5449
trikCommunicator.subdir = $$PWD/trikRuntime/trikCommunicator
5550
trikKernel.subdir = $$PWD/trikRuntime/trikKernel
5651
trikNetwork.subdir = $$PWD/trikRuntime/trikNetwork
57-
trikControl.subdir = $$PWD/trikRuntime/trikControl
52+
trikControl.file = $$PWD/trikControl.pri
5853
translations.subdir = $$PWD/trikRuntime/translations
5954
trikHal.subdir = $$PWD/trikRuntime/trikHal
6055
mlx90640-library.subdir = $$PWD/trikRuntime/mlx90640-library

0 commit comments

Comments
 (0)