diff --git a/crazyflie_ws/sandbox/crazypkg/gui/untitled/mainguiwindow.cpp b/crazyflie_ws/sandbox/crazypkg/gui/untitled/mainguiwindow.cpp
index 89b45ce5b4a4be7d920d63ae74eb0777ff72d0e0..c2e7f952080a2c3af75dfaf9422bb7ee1baa9298 100644
--- a/crazyflie_ws/sandbox/crazypkg/gui/untitled/mainguiwindow.cpp
+++ b/crazyflie_ws/sandbox/crazypkg/gui/untitled/mainguiwindow.cpp
@@ -1084,3 +1084,12 @@ void MainGUIWindow::on_checkBox_crazyfly_zones_toggled(bool checked)
scene->hideCrazyFlyZones();
}
}
+
+void MainGUIWindow::on_tabWidget_currentChanged(int index)
+{
+ if(index >= 0)
+ {
+ scene->setSelectedCrazyFlyZone(index);
+ ui->graphicsView->fitInView(scene->getRectFCrazyFlyZone(index));
+ }
+}
diff --git a/crazyflie_ws/sandbox/crazypkg/gui/untitled/mainguiwindow.h b/crazyflie_ws/sandbox/crazypkg/gui/untitled/mainguiwindow.h
index 7153bc9d079ab5cd8234efe09873edc7ac545e47..72df2764602020f9130b3dd726bf5c69f0f95fbb 100644
--- a/crazyflie_ws/sandbox/crazypkg/gui/untitled/mainguiwindow.h
+++ b/crazyflie_ws/sandbox/crazypkg/gui/untitled/mainguiwindow.h
@@ -146,6 +146,8 @@ private slots:
void on_checkBox_crazyfly_zones_toggled(bool checked);
+ void on_tabWidget_currentChanged(int index);
+
private:
Ui::MainGUIWindow *ui;
diff --git a/crazyflie_ws/sandbox/crazypkg/gui/untitled/mainguiwindow.o b/crazyflie_ws/sandbox/crazypkg/gui/untitled/mainguiwindow.o
index eeef92f865fb44a639141ed84dd180dd3281eef0..b2c948b8d6976fbb43237cdb5860075bbf6c5d92 100644
Binary files a/crazyflie_ws/sandbox/crazypkg/gui/untitled/mainguiwindow.o and b/crazyflie_ws/sandbox/crazypkg/gui/untitled/mainguiwindow.o differ
diff --git a/crazyflie_ws/sandbox/crazypkg/gui/untitled/moc_mainguiwindow.cpp b/crazyflie_ws/sandbox/crazypkg/gui/untitled/moc_mainguiwindow.cpp
index 3a3ddde6a0d99c22233154cb9fe0ab28d5e99ac5..68bded8a4ac0657584c026c86cb869bb225d5d2a 100644
--- a/crazyflie_ws/sandbox/crazypkg/gui/untitled/moc_mainguiwindow.cpp
+++ b/crazyflie_ws/sandbox/crazypkg/gui/untitled/moc_mainguiwindow.cpp
@@ -19,8 +19,8 @@
QT_BEGIN_MOC_NAMESPACE
struct qt_meta_stringdata_MainGUIWindow_t {
- QByteArrayData data[16];
- char stringdata0[310];
+ QByteArrayData data[18];
+ char stringdata0[344];
};
#define QT_MOC_LITERAL(idx, ofs, len) \
Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \
@@ -44,7 +44,9 @@ QT_MOC_LITERAL(11, 184, 6), // "newNum"
QT_MOC_LITERAL(12, 191, 32), // "on_radioButton_lock_mode_toggled"
QT_MOC_LITERAL(13, 224, 24), // "on_checkBox_grid_toggled"
QT_MOC_LITERAL(14, 249, 25), // "on_checkBox_table_toggled"
-QT_MOC_LITERAL(15, 275, 34) // "on_checkBox_crazyfly_zones_to..."
+QT_MOC_LITERAL(15, 275, 34), // "on_checkBox_crazyfly_zones_to..."
+QT_MOC_LITERAL(16, 310, 27), // "on_tabWidget_currentChanged"
+QT_MOC_LITERAL(17, 338, 5) // "index"
},
"MainGUIWindow\0set_tabs\0\0n\0transitionToMode\0"
@@ -55,7 +57,8 @@ QT_MOC_LITERAL(15, 275, 34) // "on_checkBox_crazyfly_zones_to..."
"on_radioButton_lock_mode_toggled\0"
"on_checkBox_grid_toggled\0"
"on_checkBox_table_toggled\0"
- "on_checkBox_crazyfly_zones_toggled"
+ "on_checkBox_crazyfly_zones_toggled\0"
+ "on_tabWidget_currentChanged\0index"
};
#undef QT_MOC_LITERAL
@@ -65,7 +68,7 @@ static const uint qt_meta_data_MainGUIWindow[] = {
7, // revision
0, // classname
0, 0, // classinfo
- 10, 14, // methods
+ 11, 14, // methods
0, 0, // properties
0, 0, // enums/sets
0, 0, // constructors
@@ -73,16 +76,17 @@ static const uint qt_meta_data_MainGUIWindow[] = {
0, // signalCount
// slots: name, argc, parameters, tag, flags
- 1, 1, 64, 2, 0x08 /* Private */,
- 4, 1, 67, 2, 0x08 /* Private */,
- 6, 0, 70, 2, 0x08 /* Private */,
- 7, 1, 71, 2, 0x08 /* Private */,
- 9, 1, 74, 2, 0x08 /* Private */,
- 10, 1, 77, 2, 0x08 /* Private */,
- 12, 1, 80, 2, 0x08 /* Private */,
- 13, 1, 83, 2, 0x08 /* Private */,
- 14, 1, 86, 2, 0x08 /* Private */,
- 15, 1, 89, 2, 0x08 /* Private */,
+ 1, 1, 69, 2, 0x08 /* Private */,
+ 4, 1, 72, 2, 0x08 /* Private */,
+ 6, 0, 75, 2, 0x08 /* Private */,
+ 7, 1, 76, 2, 0x08 /* Private */,
+ 9, 1, 79, 2, 0x08 /* Private */,
+ 10, 1, 82, 2, 0x08 /* Private */,
+ 12, 1, 85, 2, 0x08 /* Private */,
+ 13, 1, 88, 2, 0x08 /* Private */,
+ 14, 1, 91, 2, 0x08 /* Private */,
+ 15, 1, 94, 2, 0x08 /* Private */,
+ 16, 1, 97, 2, 0x08 /* Private */,
// slots: parameters
QMetaType::Void, QMetaType::Int, 3,
@@ -95,6 +99,7 @@ static const uint qt_meta_data_MainGUIWindow[] = {
QMetaType::Void, QMetaType::Bool, 8,
QMetaType::Void, QMetaType::Bool, 8,
QMetaType::Void, QMetaType::Bool, 8,
+ QMetaType::Void, QMetaType::Int, 17,
0 // eod
};
@@ -115,6 +120,7 @@ void MainGUIWindow::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _i
case 7: _t->on_checkBox_grid_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
case 8: _t->on_checkBox_table_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
case 9: _t->on_checkBox_crazyfly_zones_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
+ case 10: _t->on_tabWidget_currentChanged((*reinterpret_cast< int(*)>(_a[1]))); break;
default: ;
}
}
@@ -145,13 +151,13 @@ int MainGUIWindow::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
if (_id < 0)
return _id;
if (_c == QMetaObject::InvokeMetaMethod) {
- if (_id < 10)
+ if (_id < 11)
qt_static_metacall(this, _c, _id, _a);
- _id -= 10;
+ _id -= 11;
} else if (_c == QMetaObject::RegisterMethodArgumentMetaType) {
- if (_id < 10)
+ if (_id < 11)
*reinterpret_cast<int*>(_a[0]) = -1;
- _id -= 10;
+ _id -= 11;
}
return _id;
}
diff --git a/crazyflie_ws/sandbox/crazypkg/gui/untitled/moc_mainguiwindow.o b/crazyflie_ws/sandbox/crazypkg/gui/untitled/moc_mainguiwindow.o
index 7d429bb8fbd3bee1ff74b32f71cdd59e985980be..7c0a5b84ffd1111732d7f717e1b280d78ee6798d 100644
Binary files a/crazyflie_ws/sandbox/crazypkg/gui/untitled/moc_mainguiwindow.o and b/crazyflie_ws/sandbox/crazypkg/gui/untitled/moc_mainguiwindow.o differ
diff --git a/crazyflie_ws/sandbox/crazypkg/gui/untitled/moc_myGraphicsScene.o b/crazyflie_ws/sandbox/crazypkg/gui/untitled/moc_myGraphicsScene.o
index 6100f6ca70fe4e8f509b1315293f7eb52a8d5e34..bc2cca80fdbd1a729b67ed94b14fda97b63f6901 100644
Binary files a/crazyflie_ws/sandbox/crazypkg/gui/untitled/moc_myGraphicsScene.o and b/crazyflie_ws/sandbox/crazypkg/gui/untitled/moc_myGraphicsScene.o differ
diff --git a/crazyflie_ws/sandbox/crazypkg/gui/untitled/myGraphicsScene.cpp b/crazyflie_ws/sandbox/crazypkg/gui/untitled/myGraphicsScene.cpp
index b33af398a82db3fccc7c30b7764727d159348688..0db7620d3455272e17821161c8ec24c048382415 100644
--- a/crazyflie_ws/sandbox/crazypkg/gui/untitled/myGraphicsScene.cpp
+++ b/crazyflie_ws/sandbox/crazypkg/gui/untitled/myGraphicsScene.cpp
@@ -292,6 +292,12 @@ void myGraphicsScene::showCrazyFlyZones()
}
}
+QRectF myGraphicsScene::getRectFCrazyFlyZone(int index)
+{
+ QRectF rect(crazyfly_zones[index]->rect());
+ return rect;
+}
+
void myGraphicsScene::removeCrazyFlyZone(int index)
{
this->removeItem(crazyfly_zones[index]);
diff --git a/crazyflie_ws/sandbox/crazypkg/gui/untitled/myGraphicsScene.h b/crazyflie_ws/sandbox/crazypkg/gui/untitled/myGraphicsScene.h
index 4c49f55b90603680e9ec16c13a0c744214a3b428..6576f83dcbf6421e1a15795b1e9b9e17969f86c7 100644
--- a/crazyflie_ws/sandbox/crazypkg/gui/untitled/myGraphicsScene.h
+++ b/crazyflie_ws/sandbox/crazypkg/gui/untitled/myGraphicsScene.h
@@ -33,6 +33,8 @@ public:
void hideCrazyFlyZones();
void showCrazyFlyZones();
+ QRectF getRectFCrazyFlyZone(int index);
+
enum {mode_table, mode_crazyfly_zones, mode_locked};
void removeTable();
diff --git a/crazyflie_ws/sandbox/crazypkg/gui/untitled/myGraphicsScene.o b/crazyflie_ws/sandbox/crazypkg/gui/untitled/myGraphicsScene.o
index 870df0cfcbc14b10188f4f778694a3b0098d4fe7..c9fa901e5bba95354a55ca35e97cb211b0f2d98e 100644
Binary files a/crazyflie_ws/sandbox/crazypkg/gui/untitled/myGraphicsScene.o and b/crazyflie_ws/sandbox/crazypkg/gui/untitled/myGraphicsScene.o differ
diff --git a/crazyflie_ws/sandbox/crazypkg/gui/untitled/untitled b/crazyflie_ws/sandbox/crazypkg/gui/untitled/untitled
index 0f5994af0dc9f3e74f8239c75a844bcbfef491ea..9b2915f658bea70dfe62e4cf7c3f6e2b6b6876a8 100755
Binary files a/crazyflie_ws/sandbox/crazypkg/gui/untitled/untitled and b/crazyflie_ws/sandbox/crazypkg/gui/untitled/untitled differ