diff --git a/crazyflie_ws/sandbox/crazypkg/gui/untitled/Makefile b/crazyflie_ws/sandbox/crazypkg/gui/untitled/Makefile
index 458b3b7db32dd175595af3fb603c09b1a0bf0894..e1474e8a274f0c62eed37d59f2534e7b949c574d 100644
--- a/crazyflie_ws/sandbox/crazypkg/gui/untitled/Makefile
+++ b/crazyflie_ws/sandbox/crazypkg/gui/untitled/Makefile
@@ -55,9 +55,11 @@ SOURCES = main.cpp \
cornergrabber.cpp \
myGraphicsView.cpp \
crazyFlyZone.cpp \
- tablePiece.cpp moc_mainguiwindow.cpp \
+ tablePiece.cpp \
+ crazyFlyZoneTab.cpp moc_mainguiwindow.cpp \
moc_myGraphicsScene.cpp \
- moc_myGraphicsView.cpp
+ moc_myGraphicsView.cpp \
+ moc_crazyFlyZoneTab.cpp
OBJECTS = main.o \
mainguiwindow.o \
myGraphicsScene.o \
@@ -66,9 +68,11 @@ OBJECTS = main.o \
myGraphicsView.o \
crazyFlyZone.o \
tablePiece.o \
+ crazyFlyZoneTab.o \
moc_mainguiwindow.o \
moc_myGraphicsScene.o \
- moc_myGraphicsView.o
+ moc_myGraphicsView.o \
+ moc_crazyFlyZoneTab.o
DIST = /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/mkspecs/features/spec_pre.prf \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/mkspecs/common/unix.conf \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/mkspecs/common/linux.conf \
@@ -224,14 +228,16 @@ DIST = /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/mkspecs/features/spec_pre.prf
cornergrabber.h \
myGraphicsView.h \
crazyFlyZone.h \
- tablePiece.h main.cpp \
+ tablePiece.h \
+ crazyFlyZoneTab.h main.cpp \
mainguiwindow.cpp \
myGraphicsScene.cpp \
myGraphicsRectItem.cpp \
cornergrabber.cpp \
myGraphicsView.cpp \
crazyFlyZone.cpp \
- tablePiece.cpp
+ tablePiece.cpp \
+ crazyFlyZoneTab.cpp
QMAKE_TARGET = untitled
DESTDIR =
TARGET = untitled
@@ -564,8 +570,8 @@ dist: distdir FORCE
distdir: FORCE
@test -d $(DISTDIR) || mkdir -p $(DISTDIR)
$(COPY_FILE) --parents $(DIST) $(DISTDIR)/
- $(COPY_FILE) --parents mainguiwindow.h myGraphicsScene.h myGraphicsRectItem.h cornergrabber.h myGraphicsView.h crazyFlyZone.h tablePiece.h $(DISTDIR)/
- $(COPY_FILE) --parents main.cpp mainguiwindow.cpp myGraphicsScene.cpp myGraphicsRectItem.cpp cornergrabber.cpp myGraphicsView.cpp crazyFlyZone.cpp tablePiece.cpp $(DISTDIR)/
+ $(COPY_FILE) --parents mainguiwindow.h myGraphicsScene.h myGraphicsRectItem.h cornergrabber.h myGraphicsView.h crazyFlyZone.h tablePiece.h crazyFlyZoneTab.h $(DISTDIR)/
+ $(COPY_FILE) --parents main.cpp mainguiwindow.cpp myGraphicsScene.cpp myGraphicsRectItem.cpp cornergrabber.cpp myGraphicsView.cpp crazyFlyZone.cpp tablePiece.cpp crazyFlyZoneTab.cpp $(DISTDIR)/
$(COPY_FILE) --parents mainguiwindow.ui $(DISTDIR)/
@@ -592,9 +598,9 @@ benchmark: first
compiler_rcc_make_all:
compiler_rcc_clean:
-compiler_moc_header_make_all: moc_mainguiwindow.cpp moc_myGraphicsScene.cpp moc_myGraphicsView.cpp
+compiler_moc_header_make_all: moc_mainguiwindow.cpp moc_myGraphicsScene.cpp moc_myGraphicsView.cpp moc_crazyFlyZoneTab.cpp
compiler_moc_header_clean:
- -$(DEL_FILE) moc_mainguiwindow.cpp moc_myGraphicsScene.cpp moc_myGraphicsView.cpp
+ -$(DEL_FILE) moc_mainguiwindow.cpp moc_myGraphicsScene.cpp moc_myGraphicsView.cpp moc_crazyFlyZoneTab.cpp
moc_mainguiwindow.cpp: /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/QMainWindow \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qmainwindow.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qwidget.h \
@@ -719,8 +725,13 @@ moc_mainguiwindow.cpp: /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/QMai
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qinputmethod.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/QButtonGroup \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qbuttongroup.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/QCheckBox \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qcheckbox.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/QtWidgets/QFrame \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qframe.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/QGroupBox \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qgroupbox.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/QHeaderView \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qheaderview.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qabstractitemview.h \
@@ -740,6 +751,10 @@ moc_mainguiwindow.cpp: /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/QMai
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/QMenuBar \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qmenubar.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qmenu.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/QRadioButton \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qradiobutton.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/QStatusBar \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qstatusbar.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/QTabWidget \
@@ -996,6 +1011,107 @@ 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 \
+ /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 \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qsystemdetection.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qprocessordetection.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qcompilerdetection.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qtypeinfo.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qtypetraits.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qisenum.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qsysinfo.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qlogging.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qflags.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qatomic.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qbasicatomic.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qatomic_bootstrap.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qgenericatomic.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qatomic_cxx11.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qatomic_msvc.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qglobalstatic.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 \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qrefcount.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qarraydata.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qstringbuilder.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qlist.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qalgorithms.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qiterator.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qhashfunctions.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qpair.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qbytearraylist.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qstringlist.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qregexp.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qstringmatcher.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qcoreevent.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qscopedpointer.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qmetatype.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/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 \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qsize.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qpoint.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qpalette.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qcolor.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qrgb.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qrgba64.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qbrush.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qvector.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qmatrix.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qpolygon.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qregion.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qdatastream.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qiodevice.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qline.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qtransform.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qpainterpath.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qimage.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qpixelformat.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qpixmap.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qsharedpointer.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qshareddata.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qhash.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qsharedpointer_impl.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qfont.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qfontmetrics.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qfontinfo.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qsizepolicy.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qcursor.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qkeysequence.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qevent.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qvariant.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qmap.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qdebug.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qtextstream.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qlocale.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qset.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qcontiguouscache.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qurl.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qurlquery.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 \
+ 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
+
compiler_moc_source_make_all:
compiler_moc_source_clean:
compiler_uic_make_all: ui_mainguiwindow.h
@@ -1247,8 +1363,13 @@ main.o: main.cpp mainguiwindow.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qinputmethod.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/QButtonGroup \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qbuttongroup.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/QCheckBox \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qcheckbox.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/QtWidgets/QFrame \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qframe.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/QGroupBox \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qgroupbox.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/QHeaderView \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qheaderview.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qabstractitemview.h \
@@ -1268,6 +1389,10 @@ main.o: main.cpp mainguiwindow.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/QMenuBar \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qmenubar.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qmenu.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/QRadioButton \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qradiobutton.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/QStatusBar \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qstatusbar.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/QTabWidget \
@@ -1427,8 +1552,13 @@ mainguiwindow.o: mainguiwindow.cpp mainguiwindow.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qinputmethod.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/QButtonGroup \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qbuttongroup.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/QCheckBox \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qcheckbox.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/QtWidgets/QFrame \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qframe.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/QGroupBox \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qgroupbox.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/QHeaderView \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qheaderview.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qabstractitemview.h \
@@ -1448,6 +1578,10 @@ mainguiwindow.o: mainguiwindow.cpp mainguiwindow.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/QMenuBar \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qmenubar.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qmenu.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/QRadioButton \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qradiobutton.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/QStatusBar \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qstatusbar.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/QTabWidget \
@@ -1480,6 +1614,7 @@ mainguiwindow.o: mainguiwindow.cpp mainguiwindow.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/QPen \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/QPointF \
tablePiece.h \
+ crazyFlyZoneTab.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/QDoubleSpinBox \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qspinbox.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/QTextEdit \
@@ -2173,6 +2308,106 @@ tablePiece.o: tablePiece.cpp tablePiece.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/QPointF
$(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/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 \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qsystemdetection.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qprocessordetection.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qcompilerdetection.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qtypeinfo.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qtypetraits.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qisenum.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qsysinfo.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qlogging.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qflags.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qatomic.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qbasicatomic.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qatomic_bootstrap.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qgenericatomic.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qatomic_cxx11.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qatomic_msvc.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qglobalstatic.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 \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qrefcount.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qarraydata.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qstringbuilder.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qlist.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qalgorithms.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qiterator.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qhashfunctions.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qpair.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qbytearraylist.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qstringlist.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qregexp.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qstringmatcher.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qcoreevent.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qscopedpointer.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qmetatype.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/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 \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qsize.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qpoint.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qpalette.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qcolor.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qrgb.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qrgba64.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qbrush.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qvector.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qmatrix.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qpolygon.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qregion.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qdatastream.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qiodevice.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qline.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qtransform.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qpainterpath.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qimage.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qpixelformat.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qpixmap.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qsharedpointer.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qshareddata.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qhash.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qsharedpointer_impl.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qfont.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qfontmetrics.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qfontinfo.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qsizepolicy.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qcursor.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qkeysequence.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qevent.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qvariant.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qmap.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qdebug.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qtextstream.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qlocale.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qset.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qcontiguouscache.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qurl.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qurlquery.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
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o crazyFlyZoneTab.o crazyFlyZoneTab.cpp
+
moc_mainguiwindow.o: moc_mainguiwindow.cpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_mainguiwindow.o moc_mainguiwindow.cpp
@@ -2182,6 +2417,9 @@ moc_myGraphicsScene.o: moc_myGraphicsScene.cpp
moc_myGraphicsView.o: moc_myGraphicsView.cpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_myGraphicsView.o moc_myGraphicsView.cpp
+moc_crazyFlyZoneTab.o: moc_crazyFlyZoneTab.cpp
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_crazyFlyZoneTab.o moc_crazyFlyZoneTab.cpp
+
####### Install
install: FORCE
diff --git a/crazyflie_ws/sandbox/crazypkg/gui/untitled/crazyFlyZoneTab.cpp b/crazyflie_ws/sandbox/crazypkg/gui/untitled/crazyFlyZoneTab.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..4aea794e70f20b7c40d93255eae5499b4f5ad72e
--- /dev/null
+++ b/crazyflie_ws/sandbox/crazypkg/gui/untitled/crazyFlyZoneTab.cpp
@@ -0,0 +1,21 @@
+#include <crazyFlyZoneTab.h>
+
+#include <QLayout>
+
+crazyFlyZoneTab::crazyFlyZoneTab(int index, QWidget *parent)
+ : QWidget(parent)
+{
+ _index = index;
+ center_button = new QPushButton("Fit view");
+ QVBoxLayout *mainLayout = new QVBoxLayout;
+ mainLayout->addWidget(center_button);
+ setLayout(mainLayout);
+ QObject::connect(center_button, SIGNAL(clicked()), this, SLOT(centerButtonClicked()));
+ qDebug("tab widget created, index: %d", _index);
+}
+
+void crazyFlyZoneTab::centerButtonClicked()
+{
+ qDebug("index clicked: %d", _index);
+ emit centerButtonClickedSignal(_index);
+}
diff --git a/crazyflie_ws/sandbox/crazypkg/gui/untitled/crazyFlyZoneTab.h b/crazyflie_ws/sandbox/crazypkg/gui/untitled/crazyFlyZoneTab.h
new file mode 100644
index 0000000000000000000000000000000000000000..df2821afda17802ad450a9d266b0e08aab801de1
--- /dev/null
+++ b/crazyflie_ws/sandbox/crazypkg/gui/untitled/crazyFlyZoneTab.h
@@ -0,0 +1,24 @@
+#ifndef CRAZYFLYZONETAB_H
+#define CRAZYFLYZONETAB_H
+
+#include <QObject>
+#include <QWidget>
+#include <QPushButton>
+
+class crazyFlyZoneTab : public QWidget
+{
+ Q_OBJECT
+public:
+ explicit crazyFlyZoneTab(int index, QWidget *parent = 0);
+ QPushButton* center_button;
+private:
+ int _index;
+signals:
+ void centerButtonClickedSignal(int index);
+
+public slots:
+ void centerButtonClicked();
+};
+
+
+#endif
diff --git a/crazyflie_ws/sandbox/crazypkg/gui/untitled/crazyFlyZoneTab.o b/crazyflie_ws/sandbox/crazypkg/gui/untitled/crazyFlyZoneTab.o
new file mode 100644
index 0000000000000000000000000000000000000000..dc199c1fcec99334048a36338c7ff277b9d1fb25
Binary files /dev/null and b/crazyflie_ws/sandbox/crazypkg/gui/untitled/crazyFlyZoneTab.o differ
diff --git a/crazyflie_ws/sandbox/crazypkg/gui/untitled/main.o b/crazyflie_ws/sandbox/crazypkg/gui/untitled/main.o
index d25c0d2b28181050efc6b586a48265ee90bbef89..c8a34dde9816bb6f23ac1ae20c5f6229be436ab3 100644
Binary files a/crazyflie_ws/sandbox/crazypkg/gui/untitled/main.o and b/crazyflie_ws/sandbox/crazypkg/gui/untitled/main.o differ
diff --git a/crazyflie_ws/sandbox/crazypkg/gui/untitled/mainguiwindow.cpp b/crazyflie_ws/sandbox/crazypkg/gui/untitled/mainguiwindow.cpp
index c2e7f952080a2c3af75dfaf9422bb7ee1baa9298..df0d0250e943e37a42c801fe407ffa820054177f 100644
--- a/crazyflie_ws/sandbox/crazypkg/gui/untitled/mainguiwindow.cpp
+++ b/crazyflie_ws/sandbox/crazypkg/gui/untitled/mainguiwindow.cpp
@@ -1,5 +1,6 @@
#include "mainguiwindow.h"
#include "ui_mainguiwindow.h"
+#include "crazyFlyZoneTab.h"
#include <QObject>
#include <QDoubleSpinBox>
@@ -48,7 +49,9 @@ void MainGUIWindow::set_tabs(int n)
str = "CrazyFly ";
str += std::to_string(i+1);
QString qstr(str.c_str());
- ui->tabWidget->addTab(new QWidget(), qstr);
+ crazyFlyZoneTab* widget = new crazyFlyZoneTab(i);
+ ui->tabWidget->addTab(widget, qstr);
+ connect(widget, SIGNAL(centerButtonClickedSignal(int)), this, SLOT(centerViewIndex(int)));
}
}
@@ -1090,6 +1093,18 @@ void MainGUIWindow::on_tabWidget_currentChanged(int index)
if(index >= 0)
{
scene->setSelectedCrazyFlyZone(index);
- ui->graphicsView->fitInView(scene->getRectFCrazyFlyZone(index));
}
}
+
+void MainGUIWindow::centerViewIndex(int index)
+{
+ ui->graphicsView->fitInView(scene->getRectFCrazyFlyZone(index), Qt::KeepAspectRatio);
+ ui->graphicsView->scale(0.95, 0.95); // A bit back zoom, so we can see everything better
+}
+
+
+void MainGUIWindow::on_pushButton_fitAll_clicked()
+{
+ ui->graphicsView->fitInView(scene->itemsBoundingRect(), Qt::KeepAspectRatio);
+ ui->graphicsView->scale(0.95, 0.95); // A bit back zoom, so we can see everything better
+}
diff --git a/crazyflie_ws/sandbox/crazypkg/gui/untitled/mainguiwindow.h b/crazyflie_ws/sandbox/crazypkg/gui/untitled/mainguiwindow.h
index 72df2764602020f9130b3dd726bf5c69f0f95fbb..f0fac1a6c1edfd71cbcb9b62803d963785633f61 100644
--- a/crazyflie_ws/sandbox/crazypkg/gui/untitled/mainguiwindow.h
+++ b/crazyflie_ws/sandbox/crazypkg/gui/untitled/mainguiwindow.h
@@ -148,6 +148,10 @@ private slots:
void on_tabWidget_currentChanged(int index);
+ void centerViewIndex(int index);
+
+ void on_pushButton_fitAll_clicked();
+
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 b2c948b8d6976fbb43237cdb5860075bbf6c5d92..fea8cb3fee0ec7da7e91007bc9c57498f5dc9dd1 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/mainguiwindow.ui b/crazyflie_ws/sandbox/crazypkg/gui/untitled/mainguiwindow.ui
index 0d2e7334df5012a4de6308b7640359b18c5c5728..1020c9adc7a82d3ef9bae1c744fd2db089c309be 100644
--- a/crazyflie_ws/sandbox/crazypkg/gui/untitled/mainguiwindow.ui
+++ b/crazyflie_ws/sandbox/crazypkg/gui/untitled/mainguiwindow.ui
@@ -260,6 +260,19 @@
</property>
</widget>
</widget>
+ <widget class="QPushButton" name="pushButton_fitAll">
+ <property name="geometry">
+ <rect>
+ <x>800</x>
+ <y>410</y>
+ <width>51</width>
+ <height>51</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>Fit All</string>
+ </property>
+ </widget>
</widget>
<widget class="QFrame" name="frame_3">
<property name="geometry">
diff --git a/crazyflie_ws/sandbox/crazypkg/gui/untitled/moc_crazyFlyZoneTab.cpp b/crazyflie_ws/sandbox/crazypkg/gui/untitled/moc_crazyFlyZoneTab.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..04135b7371a3b20644f5dfd330550b31154f0d59
--- /dev/null
+++ b/crazyflie_ws/sandbox/crazypkg/gui/untitled/moc_crazyFlyZoneTab.cpp
@@ -0,0 +1,137 @@
+/****************************************************************************
+** Meta object code from reading C++ file 'crazyFlyZoneTab.h'
+**
+** Created by: The Qt Meta Object Compiler version 67 (Qt 5.7.0)
+**
+** WARNING! All changes made in this file will be lost!
+*****************************************************************************/
+
+#include "crazyFlyZoneTab.h"
+#include <QtCore/qbytearray.h>
+#include <QtCore/qmetatype.h>
+#if !defined(Q_MOC_OUTPUT_REVISION)
+#error "The header file 'crazyFlyZoneTab.h' doesn't include <QObject>."
+#elif Q_MOC_OUTPUT_REVISION != 67
+#error "This file was generated using the moc from 5.7.0. It"
+#error "cannot be used with the include files from this version of Qt."
+#error "(The moc has changed too much.)"
+#endif
+
+QT_BEGIN_MOC_NAMESPACE
+struct qt_meta_stringdata_crazyFlyZoneTab_t {
+ QByteArrayData data[5];
+ char stringdata0[69];
+};
+#define QT_MOC_LITERAL(idx, ofs, len) \
+ Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \
+ qptrdiff(offsetof(qt_meta_stringdata_crazyFlyZoneTab_t, stringdata0) + ofs \
+ - idx * sizeof(QByteArrayData)) \
+ )
+static const qt_meta_stringdata_crazyFlyZoneTab_t qt_meta_stringdata_crazyFlyZoneTab = {
+ {
+QT_MOC_LITERAL(0, 0, 15), // "crazyFlyZoneTab"
+QT_MOC_LITERAL(1, 16, 25), // "centerButtonClickedSignal"
+QT_MOC_LITERAL(2, 42, 0), // ""
+QT_MOC_LITERAL(3, 43, 5), // "index"
+QT_MOC_LITERAL(4, 49, 19) // "centerButtonClicked"
+
+ },
+ "crazyFlyZoneTab\0centerButtonClickedSignal\0"
+ "\0index\0centerButtonClicked"
+};
+#undef QT_MOC_LITERAL
+
+static const uint qt_meta_data_crazyFlyZoneTab[] = {
+
+ // content:
+ 7, // revision
+ 0, // classname
+ 0, 0, // classinfo
+ 2, 14, // methods
+ 0, 0, // properties
+ 0, 0, // enums/sets
+ 0, 0, // constructors
+ 0, // flags
+ 1, // signalCount
+
+ // signals: name, argc, parameters, tag, flags
+ 1, 1, 24, 2, 0x06 /* Public */,
+
+ // slots: name, argc, parameters, tag, flags
+ 4, 0, 27, 2, 0x0a /* Public */,
+
+ // signals: parameters
+ QMetaType::Void, QMetaType::Int, 3,
+
+ // slots: parameters
+ QMetaType::Void,
+
+ 0 // eod
+};
+
+void crazyFlyZoneTab::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a)
+{
+ if (_c == QMetaObject::InvokeMetaMethod) {
+ crazyFlyZoneTab *_t = static_cast<crazyFlyZoneTab *>(_o);
+ Q_UNUSED(_t)
+ switch (_id) {
+ case 0: _t->centerButtonClickedSignal((*reinterpret_cast< int(*)>(_a[1]))); break;
+ case 1: _t->centerButtonClicked(); break;
+ default: ;
+ }
+ } else if (_c == QMetaObject::IndexOfMethod) {
+ int *result = reinterpret_cast<int *>(_a[0]);
+ void **func = reinterpret_cast<void **>(_a[1]);
+ {
+ typedef void (crazyFlyZoneTab::*_t)(int );
+ if (*reinterpret_cast<_t *>(func) == static_cast<_t>(&crazyFlyZoneTab::centerButtonClickedSignal)) {
+ *result = 0;
+ return;
+ }
+ }
+ }
+}
+
+const QMetaObject crazyFlyZoneTab::staticMetaObject = {
+ { &QWidget::staticMetaObject, qt_meta_stringdata_crazyFlyZoneTab.data,
+ qt_meta_data_crazyFlyZoneTab, qt_static_metacall, Q_NULLPTR, Q_NULLPTR}
+};
+
+
+const QMetaObject *crazyFlyZoneTab::metaObject() const
+{
+ return QObject::d_ptr->metaObject ? QObject::d_ptr->dynamicMetaObject() : &staticMetaObject;
+}
+
+void *crazyFlyZoneTab::qt_metacast(const char *_clname)
+{
+ if (!_clname) return Q_NULLPTR;
+ if (!strcmp(_clname, qt_meta_stringdata_crazyFlyZoneTab.stringdata0))
+ return static_cast<void*>(const_cast< crazyFlyZoneTab*>(this));
+ return QWidget::qt_metacast(_clname);
+}
+
+int crazyFlyZoneTab::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
+{
+ _id = QWidget::qt_metacall(_c, _id, _a);
+ if (_id < 0)
+ return _id;
+ if (_c == QMetaObject::InvokeMetaMethod) {
+ if (_id < 2)
+ qt_static_metacall(this, _c, _id, _a);
+ _id -= 2;
+ } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) {
+ if (_id < 2)
+ *reinterpret_cast<int*>(_a[0]) = -1;
+ _id -= 2;
+ }
+ return _id;
+}
+
+// SIGNAL 0
+void crazyFlyZoneTab::centerButtonClickedSignal(int _t1)
+{
+ void *_a[] = { Q_NULLPTR, const_cast<void*>(reinterpret_cast<const void*>(&_t1)) };
+ QMetaObject::activate(this, &staticMetaObject, 0, _a);
+}
+QT_END_MOC_NAMESPACE
diff --git a/crazyflie_ws/sandbox/crazypkg/gui/untitled/moc_crazyFlyZoneTab.o b/crazyflie_ws/sandbox/crazypkg/gui/untitled/moc_crazyFlyZoneTab.o
new file mode 100644
index 0000000000000000000000000000000000000000..9c1e583507a4d9da9ef89ed1375857a88f4830fb
Binary files /dev/null and b/crazyflie_ws/sandbox/crazypkg/gui/untitled/moc_crazyFlyZoneTab.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 68bded8a4ac0657584c026c86cb869bb225d5d2a..ab9177b5444d70aa4a23c4611ec1294540c6e23f 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[18];
- char stringdata0[344];
+ QByteArrayData data[20];
+ char stringdata0[389];
};
#define QT_MOC_LITERAL(idx, ofs, len) \
Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \
@@ -46,7 +46,9 @@ 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(16, 310, 27), // "on_tabWidget_currentChanged"
-QT_MOC_LITERAL(17, 338, 5) // "index"
+QT_MOC_LITERAL(17, 338, 5), // "index"
+QT_MOC_LITERAL(18, 344, 15), // "centerViewIndex"
+QT_MOC_LITERAL(19, 360, 28) // "on_pushButton_fitAll_clicked"
},
"MainGUIWindow\0set_tabs\0\0n\0transitionToMode\0"
@@ -58,7 +60,8 @@ QT_MOC_LITERAL(17, 338, 5) // "index"
"on_checkBox_grid_toggled\0"
"on_checkBox_table_toggled\0"
"on_checkBox_crazyfly_zones_toggled\0"
- "on_tabWidget_currentChanged\0index"
+ "on_tabWidget_currentChanged\0index\0"
+ "centerViewIndex\0on_pushButton_fitAll_clicked"
};
#undef QT_MOC_LITERAL
@@ -68,7 +71,7 @@ static const uint qt_meta_data_MainGUIWindow[] = {
7, // revision
0, // classname
0, 0, // classinfo
- 11, 14, // methods
+ 13, 14, // methods
0, 0, // properties
0, 0, // enums/sets
0, 0, // constructors
@@ -76,17 +79,19 @@ static const uint qt_meta_data_MainGUIWindow[] = {
0, // signalCount
// slots: name, argc, parameters, tag, flags
- 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 */,
+ 1, 1, 79, 2, 0x08 /* Private */,
+ 4, 1, 82, 2, 0x08 /* Private */,
+ 6, 0, 85, 2, 0x08 /* Private */,
+ 7, 1, 86, 2, 0x08 /* Private */,
+ 9, 1, 89, 2, 0x08 /* Private */,
+ 10, 1, 92, 2, 0x08 /* Private */,
+ 12, 1, 95, 2, 0x08 /* Private */,
+ 13, 1, 98, 2, 0x08 /* Private */,
+ 14, 1, 101, 2, 0x08 /* Private */,
+ 15, 1, 104, 2, 0x08 /* Private */,
+ 16, 1, 107, 2, 0x08 /* Private */,
+ 18, 1, 110, 2, 0x08 /* Private */,
+ 19, 0, 113, 2, 0x08 /* Private */,
// slots: parameters
QMetaType::Void, QMetaType::Int, 3,
@@ -100,6 +105,8 @@ static const uint qt_meta_data_MainGUIWindow[] = {
QMetaType::Void, QMetaType::Bool, 8,
QMetaType::Void, QMetaType::Bool, 8,
QMetaType::Void, QMetaType::Int, 17,
+ QMetaType::Void, QMetaType::Int, 17,
+ QMetaType::Void,
0 // eod
};
@@ -121,6 +128,8 @@ void MainGUIWindow::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _i
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;
+ case 11: _t->centerViewIndex((*reinterpret_cast< int(*)>(_a[1]))); break;
+ case 12: _t->on_pushButton_fitAll_clicked(); break;
default: ;
}
}
@@ -151,13 +160,13 @@ int MainGUIWindow::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
if (_id < 0)
return _id;
if (_c == QMetaObject::InvokeMetaMethod) {
- if (_id < 11)
+ if (_id < 13)
qt_static_metacall(this, _c, _id, _a);
- _id -= 11;
+ _id -= 13;
} else if (_c == QMetaObject::RegisterMethodArgumentMetaType) {
- if (_id < 11)
+ if (_id < 13)
*reinterpret_cast<int*>(_a[0]) = -1;
- _id -= 11;
+ _id -= 13;
}
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 7c0a5b84ffd1111732d7f717e1b280d78ee6798d..55ec7ffc489cf13a5c14f60aaa8e33954c51d6a6 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/myGraphicsScene.cpp b/crazyflie_ws/sandbox/crazypkg/gui/untitled/myGraphicsScene.cpp
index 0db7620d3455272e17821161c8ec24c048382415..0a2503cc4eba1d3d26b49a4483fba4d034564a09 100644
--- a/crazyflie_ws/sandbox/crazypkg/gui/untitled/myGraphicsScene.cpp
+++ b/crazyflie_ws/sandbox/crazypkg/gui/untitled/myGraphicsScene.cpp
@@ -294,7 +294,7 @@ void myGraphicsScene::showCrazyFlyZones()
QRectF myGraphicsScene::getRectFCrazyFlyZone(int index)
{
- QRectF rect(crazyfly_zones[index]->rect());
+ QRectF rect(crazyfly_zones[index]->sceneBoundingRect());
return rect;
}
diff --git a/crazyflie_ws/sandbox/crazypkg/gui/untitled/myGraphicsScene.o b/crazyflie_ws/sandbox/crazypkg/gui/untitled/myGraphicsScene.o
index c9fa901e5bba95354a55ca35e97cb211b0f2d98e..48638b68c6ac20891f1a1935baf9be34309b7cb7 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/myGraphicsView.cpp b/crazyflie_ws/sandbox/crazypkg/gui/untitled/myGraphicsView.cpp
index a8f18c9df307a9ba3cf401360ab2d0d17e17a264..e7b687724aabb6c828a66873d0bfafdd0586a9a2 100644
--- a/crazyflie_ws/sandbox/crazypkg/gui/untitled/myGraphicsView.cpp
+++ b/crazyflie_ws/sandbox/crazypkg/gui/untitled/myGraphicsView.cpp
@@ -20,7 +20,7 @@ void myGraphicsView::wheelEvent(QWheelEvent *event)
double scaleFactor = 1.15;
if(event->delta() > 0) {
// Zoom in
- this-> scale(scaleFactor, scaleFactor);
+ this->scale(scaleFactor, scaleFactor);
} else {
// Zooming out
diff --git a/crazyflie_ws/sandbox/crazypkg/gui/untitled/ui_mainguiwindow.h b/crazyflie_ws/sandbox/crazypkg/gui/untitled/ui_mainguiwindow.h
index f05991a799e88aeb8bf6d581522028d47d65ed1c..d80802ba80db0098df97cf2413b9fb8d2b2db27c 100644
--- a/crazyflie_ws/sandbox/crazypkg/gui/untitled/ui_mainguiwindow.h
+++ b/crazyflie_ws/sandbox/crazypkg/gui/untitled/ui_mainguiwindow.h
@@ -47,6 +47,7 @@ public:
QCheckBox *checkBox_vicon_markers;
QCheckBox *checkBox_grid;
QCheckBox *checkBox_table;
+ QPushButton *pushButton_fitAll;
QFrame *frame_3;
QMenuBar *menuBar;
QToolBar *mainToolBar;
@@ -123,6 +124,9 @@ public:
checkBox_table->setGeometry(QRect(10, 80, 101, 20));
checkBox_table->setFont(font);
checkBox_table->setChecked(true);
+ pushButton_fitAll = new QPushButton(frame_drawing);
+ pushButton_fitAll->setObjectName(QStringLiteral("pushButton_fitAll"));
+ pushButton_fitAll->setGeometry(QRect(800, 410, 51, 51));
frame_3 = new QFrame(centralWidget);
frame_3->setObjectName(QStringLiteral("frame_3"));
frame_3->setGeometry(QRect(990, 20, 481, 469));
@@ -161,6 +165,7 @@ public:
checkBox_vicon_markers->setText(QApplication::translate("MainGUIWindow", "Show Markers", 0));
checkBox_grid->setText(QApplication::translate("MainGUIWindow", "Show Grid", 0));
checkBox_table->setText(QApplication::translate("MainGUIWindow", "Show Table", 0));
+ pushButton_fitAll->setText(QApplication::translate("MainGUIWindow", "Fit All", 0));
} // retranslateUi
};
diff --git a/crazyflie_ws/sandbox/crazypkg/gui/untitled/untitled b/crazyflie_ws/sandbox/crazypkg/gui/untitled/untitled
index 9b2915f658bea70dfe62e4cf7c3f6e2b6b6876a8..b3d5c2ce959ff262c57aec682e0d84eb0f5e0d48 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 b/crazyflie_ws/sandbox/crazypkg/gui/untitled/untitled.pro
index ae6a159305a57d56544a341f212dc921e1268584..068e4168cfc601f33b67a076fd9f0cb9782a346f 100644
--- a/crazyflie_ws/sandbox/crazypkg/gui/untitled/untitled.pro
+++ b/crazyflie_ws/sandbox/crazypkg/gui/untitled/untitled.pro
@@ -19,7 +19,8 @@ SOURCES += main.cpp\
cornergrabber.cpp \
myGraphicsView.cpp \
crazyFlyZone.cpp \
- tablePiece.cpp
+ tablePiece.cpp \
+ crazyFlyZoneTab.cpp
HEADERS += mainguiwindow.h \
myGraphicsScene.h \
@@ -27,6 +28,7 @@ HEADERS += mainguiwindow.h \
cornergrabber.h \
myGraphicsView.h \
crazyFlyZone.h \
- tablePiece.h
+ tablePiece.h \
+ crazyFlyZoneTab.h
FORMS += mainguiwindow.ui