diff --git a/crazyflie_ws/sandbox/crazypkg/gui/untitled/Makefile b/crazyflie_ws/sandbox/crazypkg/gui/untitled/Makefile
index e1474e8a274f0c62eed37d59f2534e7b949c574d..42798a45cf0e3f73d87b11da0aa1cea8d55b3656 100644
--- a/crazyflie_ws/sandbox/crazypkg/gui/untitled/Makefile
+++ b/crazyflie_ws/sandbox/crazypkg/gui/untitled/Makefile
@@ -1011,9 +1011,10 @@ moc_myGraphicsView.cpp: /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/QGr
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/bin/moc
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/bin/moc $(DEFINES) -I/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/mkspecs/linux-g++ -I/home/gazebo-cf/work/D-FaLL-System/crazyflie_ws/sandbox/crazypkg/gui/untitled -I/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include -I/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets -I/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui -I/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore -I/usr/include/c++/5 -I/usr/include/x86_64-linux-gnu/c++/5 -I/usr/include/c++/5/backward -I/usr/lib/gcc/x86_64-linux-gnu/5/include -I/usr/local/include -I/usr/lib/gcc/x86_64-linux-gnu/5/include-fixed -I/usr/include/x86_64-linux-gnu -I/usr/include myGraphicsView.h -o moc_myGraphicsView.cpp
-moc_crazyFlyZoneTab.cpp: /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/QWidget \
- /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qwidget.h \
- /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qwindowdefs.h \
+moc_crazyFlyZoneTab.cpp: /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/QObject \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qobject.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qobjectdefs.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qnamespace.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qglobal.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qconfig.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qfeatures.h \
@@ -1036,11 +1037,7 @@ moc_crazyFlyZoneTab.cpp: /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/QW
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qmutex.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qnumeric.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qversiontagging.h \
- /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qobjectdefs.h \
- /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qnamespace.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qobjectdefs_impl.h \
- /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qwindowdefs_win.h \
- /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qobject.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qstring.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qchar.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qbytearray.h \
@@ -1062,6 +1059,10 @@ moc_crazyFlyZoneTab.cpp: /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/QW
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qvarlengtharray.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qcontainerfwd.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qobject_impl.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/QWidget \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qwidget.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qwindowdefs.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qwindowdefs_win.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qmargins.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qpaintdevice.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qrect.h \
@@ -1108,6 +1109,10 @@ moc_crazyFlyZoneTab.cpp: /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/QW
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qfiledevice.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qvector2d.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qtouchdevice.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/QPushButton \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qpushbutton.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qabstractbutton.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qicon.h \
crazyFlyZoneTab.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/bin/moc
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/bin/moc $(DEFINES) -I/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/mkspecs/linux-g++ -I/home/gazebo-cf/work/D-FaLL-System/crazyflie_ws/sandbox/crazypkg/gui/untitled -I/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include -I/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets -I/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui -I/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore -I/usr/include/c++/5 -I/usr/include/x86_64-linux-gnu/c++/5 -I/usr/include/c++/5/backward -I/usr/lib/gcc/x86_64-linux-gnu/5/include -I/usr/local/include -I/usr/lib/gcc/x86_64-linux-gnu/5/include-fixed -I/usr/include/x86_64-linux-gnu -I/usr/include crazyFlyZoneTab.h -o moc_crazyFlyZoneTab.cpp
@@ -2309,9 +2314,10 @@ tablePiece.o: tablePiece.cpp tablePiece.h \
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o tablePiece.o tablePiece.cpp
crazyFlyZoneTab.o: crazyFlyZoneTab.cpp crazyFlyZoneTab.h \
- /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/QWidget \
- /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qwidget.h \
- /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qwindowdefs.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/QObject \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qobject.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qobjectdefs.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qnamespace.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qglobal.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qconfig.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qfeatures.h \
@@ -2334,11 +2340,7 @@ crazyFlyZoneTab.o: crazyFlyZoneTab.cpp crazyFlyZoneTab.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qmutex.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qnumeric.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qversiontagging.h \
- /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qobjectdefs.h \
- /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qnamespace.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qobjectdefs_impl.h \
- /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qwindowdefs_win.h \
- /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qobject.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qstring.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qchar.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qbytearray.h \
@@ -2360,6 +2362,10 @@ crazyFlyZoneTab.o: crazyFlyZoneTab.cpp crazyFlyZoneTab.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qvarlengtharray.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qcontainerfwd.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qobject_impl.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/QWidget \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qwidget.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qwindowdefs.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qwindowdefs_win.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qmargins.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qpaintdevice.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qrect.h \
@@ -2405,7 +2411,16 @@ crazyFlyZoneTab.o: crazyFlyZoneTab.cpp crazyFlyZoneTab.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qfile.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qfiledevice.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qvector2d.h \
- /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qtouchdevice.h
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qtouchdevice.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/QPushButton \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qpushbutton.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qabstractbutton.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qicon.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/QLayout \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qlayout.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qlayoutitem.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qboxlayout.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qgridlayout.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o crazyFlyZoneTab.o crazyFlyZoneTab.cpp
moc_mainguiwindow.o: moc_mainguiwindow.cpp
diff --git a/crazyflie_ws/sandbox/crazypkg/gui/untitled/crazyFlyZoneTab.cpp b/crazyflie_ws/sandbox/crazypkg/gui/untitled/crazyFlyZoneTab.cpp
index 4aea794e70f20b7c40d93255eae5499b4f5ad72e..b3a18fbdc6bfe160e3ac2382382c59bbdc15f1b7 100644
--- a/crazyflie_ws/sandbox/crazypkg/gui/untitled/crazyFlyZoneTab.cpp
+++ b/crazyflie_ws/sandbox/crazypkg/gui/untitled/crazyFlyZoneTab.cpp
@@ -6,9 +6,25 @@ crazyFlyZoneTab::crazyFlyZoneTab(int index, QWidget *parent)
: QWidget(parent)
{
_index = index;
+ _num_rows = 3;
+ _num_columns = 3;
center_button = new QPushButton("Fit view");
- QVBoxLayout *mainLayout = new QVBoxLayout;
- mainLayout->addWidget(center_button);
+ QGridLayout *mainLayout = new QGridLayout;
+ // mainLayout->setRowMinimumHeight(1, 25);
+ // mainLayout->setRowMinimumHeight(2, 25);
+ // mainLayout->setRowStretch(1);
+ // mainLayout->setColumnMinimumWidth(5);
+ for(int i = 0; i < _num_rows; i++)
+ {
+ mainLayout->setRowStretch(i, 1);
+ }
+
+ for(int i = 0; i < _num_columns; i++)
+ {
+ mainLayout->setColumnStretch(i, 1);
+ }
+
+ mainLayout->addWidget(center_button, _num_rows - 1, _num_columns - 1);
setLayout(mainLayout);
QObject::connect(center_button, SIGNAL(clicked()), this, SLOT(centerButtonClicked()));
qDebug("tab widget created, index: %d", _index);
diff --git a/crazyflie_ws/sandbox/crazypkg/gui/untitled/crazyFlyZoneTab.h b/crazyflie_ws/sandbox/crazypkg/gui/untitled/crazyFlyZoneTab.h
index df2821afda17802ad450a9d266b0e08aab801de1..164ba764777bea716d610089af06f5ab08f5245d 100644
--- a/crazyflie_ws/sandbox/crazypkg/gui/untitled/crazyFlyZoneTab.h
+++ b/crazyflie_ws/sandbox/crazypkg/gui/untitled/crazyFlyZoneTab.h
@@ -13,6 +13,8 @@ public:
QPushButton* center_button;
private:
int _index;
+ int _num_rows;
+ int _num_columns;
signals:
void centerButtonClickedSignal(int index);
diff --git a/crazyflie_ws/sandbox/crazypkg/gui/untitled/crazyFlyZoneTab.o b/crazyflie_ws/sandbox/crazypkg/gui/untitled/crazyFlyZoneTab.o
index dc199c1fcec99334048a36338c7ff277b9d1fb25..99fe55ae9e4846906cb88c68457040ce23b27044 100644
Binary files a/crazyflie_ws/sandbox/crazypkg/gui/untitled/crazyFlyZoneTab.o and b/crazyflie_ws/sandbox/crazypkg/gui/untitled/crazyFlyZoneTab.o differ
diff --git a/crazyflie_ws/sandbox/crazypkg/gui/untitled/mainguiwindow.o b/crazyflie_ws/sandbox/crazypkg/gui/untitled/mainguiwindow.o
index fea8cb3fee0ec7da7e91007bc9c57498f5dc9dd1..5dce25cfea329977248f281bd87954a92ecd2ab2 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_crazyFlyZoneTab.o b/crazyflie_ws/sandbox/crazypkg/gui/untitled/moc_crazyFlyZoneTab.o
index 9c1e583507a4d9da9ef89ed1375857a88f4830fb..8f85fe7447c4b80ec408323d28904b6e1ec0bb24 100644
Binary files a/crazyflie_ws/sandbox/crazypkg/gui/untitled/moc_crazyFlyZoneTab.o and b/crazyflie_ws/sandbox/crazypkg/gui/untitled/moc_crazyFlyZoneTab.o differ
diff --git a/crazyflie_ws/sandbox/crazypkg/gui/untitled/untitled b/crazyflie_ws/sandbox/crazypkg/gui/untitled/untitled
index b3d5c2ce959ff262c57aec682e0d84eb0f5e0d48..49bde0f1ed5d6588834ae40dfb977b3808933bae 100755
Binary files a/crazyflie_ws/sandbox/crazypkg/gui/untitled/untitled and b/crazyflie_ws/sandbox/crazypkg/gui/untitled/untitled differ
diff --git a/crazyflie_ws/sandbox/crazypkg/gui/untitled/untitled.pro.user b/crazyflie_ws/sandbox/crazypkg/gui/untitled/untitled.pro.user
index c277bac075fce71c7b4821df61af88f0b0ce20f6..94a7d132475bad46e3e354b393f155ae14a74374 100644
--- a/crazyflie_ws/sandbox/crazypkg/gui/untitled/untitled.pro.user
+++ b/crazyflie_ws/sandbox/crazypkg/gui/untitled/untitled.pro.user
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.0.2, 2017-04-11T17:01:44. -->
+<!-- Written by QtCreator 4.0.2, 2017-04-18T16:57:38. -->
<qtcreator>
<data>
<variable>EnvironmentId</variable>