Skip to content

Commit 48f4d8a

Browse files
Added tilting table as setup
1 parent e164bd5 commit 48f4d8a

File tree

7 files changed

+65
-9
lines changed

7 files changed

+65
-9
lines changed

Diff for: QRoboticsCenter/BalancingRobot/qtiltingtable.cpp

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
#include "qtiltingtable.h"
2+
3+
QTiltingTable::QTiltingTable(int id, QObject *parent) :
4+
QBalancingRobot(id,parent)
5+
{
6+
setup();
7+
}
8+
9+
void QTiltingTable::setup()
10+
{
11+
// Default balancing robot setup
12+
QBalancingRobot::setup();
13+
QBalancingWidget* w = getWindow()->getBalancingView();
14+
15+
// Setup jumping
16+
w->setJumping();
17+
18+
// Setup map widget
19+
w->map()->setRange(100.0);
20+
w->map()->getRobot()->getMarker()->setSize(5.0);
21+
w->map()->getRobot()->getMarker()->setSize(0.0);
22+
}
23+
24+
QString QTiltingTable::getType()
25+
{
26+
return "TiltingTable";
27+
}
28+
29+
QIcon QTiltingTable::getIcon()
30+
{
31+
return QIcon(":/icons/tiltingtable.png");
32+
}

Diff for: QRoboticsCenter/BalancingRobot/qtiltingtable.h

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#ifndef QTILTINGTABLE_H
2+
#define QTILTINGTABLE_H
3+
4+
#include <qbalancingrobot.h>
5+
6+
class QTiltingTable : public QBalancingRobot
7+
{
8+
public:
9+
QTiltingTable(int id, QObject *parent = 0);
10+
void setup();
11+
12+
QString getType();
13+
QIcon getIcon();
14+
};
15+
16+
#endif // QTILTINGTABLE_H

Diff for: QRoboticsCenter/BasicRobot/qrobotcoordinator.cpp

+3
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,9 @@ QAbstractRobot *QRobotCoordinator::addRobot(unsigned int id, unsigned int type)
6262
case(SEGBOT):
6363
//robot = new QSegbot(id,this);
6464
break;
65+
case(TILTINGTABLE):
66+
robot = new QTiltingTable(id,this);
67+
break;
6568
case(CAR):
6669
robot = new QCar(id,this);
6770
break;

Diff for: QRoboticsCenter/BasicRobot/qrobotcoordinator.h

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#include <qunknownrobot.h>
99
#include <qcar.h>
1010
#include <qballbot.h>
11+
#include <qtiltingtable.h>
1112
#include <qmavlinkconnection.h>
1213
#include <qaboutdialog.h>
1314
#include <qtrustmaster.h>
@@ -28,6 +29,7 @@ class QRobotCoordinator : public QMainWindow
2829
typedef enum type_t{
2930
BALLBOT = 10,
3031
SEGBOT = 11,
32+
TILTINGTABLE = 12,
3133
CAR = 20
3234
} type_t;
3335

Diff for: QRoboticsCenter/QRoboticsCenter.pro

+11-9
Original file line numberDiff line numberDiff line change
@@ -31,17 +31,18 @@ SOURCES += main.cpp\
3131
BasicRobot/qrobotconnectionmanager.cpp \
3232
BasicRobot/qrobotwindow.cpp \
3333
BasicRobot/qrobotbutton.cpp \
34-
BasicRobot/qunknownrobot.cpp \
35-
BasicRobot/qbasicrobot.cpp \
36-
BasicRobot/qcar.cpp \
34+
BasicRobot/qunknownrobot.cpp \
35+
BasicRobot/qbasicrobot.cpp \
36+
BasicRobot/qcar.cpp \
3737
BalancingRobot/qbalancingwidget.cpp \
3838
BalancingRobot/ballbotconfigdialog.cpp \
3939
BalancingRobot/qbalancingrecordermanager.cpp \
4040
BalancingRobot/qbalancingwindow.cpp \
4141
BalancingRobot/qbalancingrobot.cpp \
4242
BalancingRobot/qbalancingconnectionmanager.cpp \
4343
BalancingRobot/qballbot.cpp \
44-
BalancingRobot/qballbotinput.cpp
44+
BalancingRobot/qballbotinput.cpp \
45+
BalancingRobot/qtiltingtable.cpp
4546

4647
HEADERS += mainwindow.h \
4748
qprintstitcher.h \
@@ -56,18 +57,19 @@ HEADERS += mainwindow.h \
5657
BasicRobot/qstackedwindow.h \
5758
BasicRobot/qrobotlog.h \
5859
BasicRobot/qrobotconfig.h \
59-
BasicRobot/qunknownrobot.h \
60-
BasicRobot/qbasicrobot.h \
61-
BasicRobot/qcar.h\
60+
BasicRobot/qunknownrobot.h \
61+
BasicRobot/qbasicrobot.h \
62+
BasicRobot/qcar.h\
6263
BalancingRobot/qbalancingrecordermanager.h \
6364
BalancingRobot/qbalancingwindow.h \
6465
BalancingRobot/qbalancingrobot.h \
6566
BalancingRobot/qbalancingconnectionmanager.h \
6667
BalancingRobot/qballbot.h \
6768
BalancingRobot/qbalancingwidget.h \
6869
BalancingRobot/ballbotconfigdialog.h \
69-
BalancingRobot/qballbotinput.h \
70-
qrobotevents.h
70+
BalancingRobot/qballbotinput.h \
71+
BalancingRobot/qtiltingtable.h \
72+
qrobotevents.h
7173

7274
FORMS += mainwindow.ui \
7375
qaboutdialog.ui \

Diff for: QRoboticsCenter/icons.qrc

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<file>../icons/QRoboticsCenterLogo_blue.png</file>
44
<file>../icons/car.png</file>
55
<file>../icons/ballbot.png</file>
6+
<file>../icons/tiltingtable.png</file>
67
<file>../icons/unknown.png</file>
78
<file>../icons/balancing_control_idle.png</file>
89
<file>../icons/balancing_control_attitude.png</file>

Diff for: icons/tiltingtable.png

110 KB
Loading

0 commit comments

Comments
 (0)