Skip to content

Commit 47283b6

Browse files
vdm-devvdm-dev
authored
feat(robodk_interface): update Plugin Interface with new Matrix, Vector and Joint classes (PR #70)
2 parents 7f0fe30 + aafaeb8 commit 47283b6

File tree

32 files changed

+3153
-1744
lines changed

32 files changed

+3153
-1744
lines changed

‎.github/workflows/plug-in-interface.yml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
fail-fast: true
2828
matrix:
2929
include:
30-
- os: windows-2019
30+
- os: windows-latest
3131
OUTPUT_DIR: C:/RoboDK/bin/plugins
3232
QT_VERSION: "5.15.2"
3333

@@ -51,14 +51,17 @@ jobs:
5151
cache: "true"
5252
cache-key-prefix: "install-qt-action-${{ matrix.os }}"
5353

54+
- name: Prepare Visual Studio environment on Windows
55+
if: startsWith(matrix.os, 'windows')
56+
uses: johnnynunez/vsdevenv-shell@v2
57+
5458
- name: Configure and build Plug-In-Interface on Windows
5559
if: startsWith(matrix.os, 'windows')
5660
run: |
5761
cd ${{ github.workspace }}
58-
call "%programfiles(x86)%\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x86_amd64
5962
qmake Plug-In-Interface.pro -spec win32-msvc CONFIG+=qtquickcompiler CONFIG+=${{ env.BUILD_TYPE }}
6063
call %IQTA_TOOLS%\QtCreator\bin\jom\jom.exe
61-
shell: cmd
64+
shell: vsdevenv x64 cmd {0}
6265

6366
- name: Configure and build Plug-In-Interface on Unix
6467
if: (!startsWith(matrix.os, 'windows'))

‎Plugin-OPC-UA/PluginOPCUA.pro‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -118,18 +118,7 @@ FORMS += \
118118
#--------------------------
119119
# Header and source files required by any RoboDK plugin
120120
# Do not change this section, make sure to have the robodk_interface folder up one folder
121-
HEADERS += \
122-
../robodk_interface/iitem.h \
123-
../robodk_interface/irobodk.h\
124-
../robodk_interface/iapprobodk.h \
125-
../robodk_interface/robodktypes.h \
126-
../robodk_interface/robodktools.h \
127-
128-
SOURCES += \
129-
../robodk_interface/robodktools.cpp \
130-
../robodk_interface/robodktypes.cpp
131-
132-
INCLUDEPATH += ../robodk_interface
121+
include($$PWD/../robodk_interface/robodk_interface.pri)
133122
#--------------------------
134123

135124

‎PluginAppLoader/AppLoader.pro‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,8 @@ CONFIG(release, debug|release) {
9090
#--------------------------
9191
# Add header and source files (use File->New File or Project and add your files)
9292
# This can be modified manually or automatically by Qt Creator
93+
INCLUDEPATH += ./zip
94+
9395
HEADERS += \
9496
applistdelegate.h \
9597
apploader.h \
@@ -117,17 +119,5 @@ FORMS += \
117119
#--------------------------
118120
# Header and source files required by any RoboDK plugin
119121
# Do not change this section, make sure to have the robodk_interface folder up one folder
120-
HEADERS += \
121-
../robodk_interface/iitem.h \
122-
../robodk_interface/irobodk.h\
123-
../robodk_interface/iapprobodk.h \
124-
../robodk_interface/robodktypes.h \
125-
../robodk_interface/robodktools.h \
126-
127-
SOURCES += \
128-
../robodk_interface/robodktools.cpp \
129-
../robodk_interface/robodktypes.cpp
130-
131-
INCLUDEPATH += ../robodk_interface ./zip
122+
include($$PWD/../robodk_interface/robodk_interface.pri)
132123
#--------------------------
133-

‎PluginAttachObject/PluginAttachObject.pro‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -104,16 +104,5 @@ SOURCES += \
104104
#--------------------------
105105
# Header and source files required by any RoboDK plugin
106106
# Do not change this section, make sure to have the robodk_interface folder up one folder
107-
HEADERS += \
108-
../robodk_interface/iitem.h \
109-
../robodk_interface/irobodk.h\
110-
../robodk_interface/iapprobodk.h \
111-
../robodk_interface/robodktypes.h \
112-
../robodk_interface/robodktools.h \
113-
114-
SOURCES += \
115-
../robodk_interface/robodktools.cpp \
116-
../robodk_interface/robodktypes.cpp
117-
118-
INCLUDEPATH += ../robodk_interface
107+
include($$PWD/../robodk_interface/robodk_interface.pri)
119108
#--------------------------

‎PluginAttachView/PluginAttachView.pro‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -103,16 +103,5 @@ SOURCES += \
103103
#--------------------------
104104
# Header and source files required by any RoboDK plugin
105105
# Do not change this section, make sure to have the robodk_interface folder up one folder
106-
HEADERS += \
107-
../robodk_interface/iitem.h \
108-
../robodk_interface/irobodk.h\
109-
../robodk_interface/iapprobodk.h \
110-
../robodk_interface/robodktypes.h \
111-
../robodk_interface/robodktools.h \
112-
113-
SOURCES += \
114-
../robodk_interface/robodktools.cpp \
115-
../robodk_interface/robodktypes.cpp
116-
117-
INCLUDEPATH += ../robodk_interface
106+
include($$PWD/../robodk_interface/robodk_interface.pri)
118107
#--------------------------

‎PluginBallbarTracker/PluginBallbarTracker.pro‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -104,16 +104,5 @@ SOURCES += \
104104
#--------------------------
105105
# Header and source files required by any RoboDK plugin
106106
# Do not change this section, make sure to have the robodk_interface folder up one folder
107-
HEADERS += \
108-
../robodk_interface/iitem.h \
109-
../robodk_interface/irobodk.h\
110-
../robodk_interface/iapprobodk.h \
111-
../robodk_interface/robodktypes.h \
112-
../robodk_interface/robodktools.h \
113-
114-
SOURCES += \
115-
../robodk_interface/robodktools.cpp \
116-
../robodk_interface/robodktypes.cpp
117-
118-
INCLUDEPATH += ../robodk_interface
107+
include($$PWD/../robodk_interface/robodk_interface.pri)
119108
#--------------------------

‎PluginCollisionSensor/PluginCollisionSensor.pro‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -103,16 +103,5 @@ SOURCES += \
103103
#--------------------------
104104
# Header and source files required by any RoboDK plugin
105105
# Do not change this section, make sure to have the robodk_interface folder up one folder
106-
HEADERS += \
107-
../robodk_interface/iitem.h \
108-
../robodk_interface/irobodk.h\
109-
../robodk_interface/iapprobodk.h \
110-
../robodk_interface/robodktypes.h \
111-
../robodk_interface/robodktools.h \
112-
113-
SOURCES += \
114-
../robodk_interface/robodktools.cpp \
115-
../robodk_interface/robodktypes.cpp
116-
117-
INCLUDEPATH += ../robodk_interface
106+
include($$PWD/../robodk_interface/robodk_interface.pri)
118107
#--------------------------

‎PluginEmbedding/PluginEmbedding.pro‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -96,17 +96,11 @@ SOURCES += \
9696
pluginembedding.cpp \
9797
pluginform.cpp
9898

99+
FORMS += \
100+
pluginform.ui
99101

100102
#--------------------------
101103
# Header and source files required by any RoboDK plugin
102104
# Do not change this section, make sure to have the robodk_interface folder up one folder
103-
HEADERS += \
104-
../robodk_interface/iitem.h \
105-
../robodk_interface/irobodk.h\
106-
../robodk_interface/iapprobodk.h
107-
108-
INCLUDEPATH += ../robodk_interface
105+
include($$PWD/../robodk_interface/robodk_interface.pri)
109106
#--------------------------
110-
111-
FORMS += \
112-
pluginform.ui

‎PluginExample/PluginExample.pro‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -104,20 +104,8 @@ RESOURCES += \
104104
resources1.qrc
105105

106106

107-
108107
#--------------------------
109108
# Header and source files required by any RoboDK plugin
110109
# Do not change this section, make sure to have the robodk_interface folder up one folder
111-
HEADERS += \
112-
../robodk_interface/iitem.h \
113-
../robodk_interface/irobodk.h\
114-
../robodk_interface/iapprobodk.h \
115-
../robodk_interface/robodktypes.h \
116-
../robodk_interface/robodktools.h \
117-
118-
SOURCES += \
119-
../robodk_interface/robodktools.cpp \
120-
../robodk_interface/robodktypes.cpp
121-
122-
INCLUDEPATH += ../robodk_interface
110+
include($$PWD/../robodk_interface/robodk_interface.pri)
123111
#--------------------------

‎PluginLVDT/PluginLVDT.pro‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -99,20 +99,8 @@ SOURCES += \
9999

100100

101101

102-
103102
#--------------------------
104103
# Header and source files required by any RoboDK plugin
105104
# Do not change this section, make sure to have the robodk_interface folder up one folder
106-
HEADERS += \
107-
../robodk_interface/iitem.h \
108-
../robodk_interface/irobodk.h\
109-
../robodk_interface/iapprobodk.h \
110-
../robodk_interface/robodktypes.h \
111-
../robodk_interface/robodktools.h \
112-
113-
SOURCES += \
114-
../robodk_interface/robodktools.cpp \
115-
../robodk_interface/robodktypes.cpp
116-
117-
INCLUDEPATH += ../robodk_interface
105+
include($$PWD/../robodk_interface/robodk_interface.pri)
118106
#--------------------------

0 commit comments

Comments
 (0)