diff --git a/crazyflie_ws/sandbox/crazypkg/gui/untitled/Makefile b/crazyflie_ws/sandbox/crazypkg/gui/untitled/Makefile
index ce8e61bffe5c5d1f7a76bbc3fda363e8b3a27e8a..99d704469214f637420a5885675e152d2ead5907 100644
--- a/crazyflie_ws/sandbox/crazypkg/gui/untitled/Makefile
+++ b/crazyflie_ws/sandbox/crazypkg/gui/untitled/Makefile
@@ -52,15 +52,19 @@ SOURCES = main.cpp \
mainguiwindow.cpp \
myGraphicsScene.cpp \
myGraphicsRectItem.cpp \
- cornergrabber.cpp moc_mainguiwindow.cpp \
- moc_myGraphicsScene.cpp
+ cornergrabber.cpp \
+ myGraphicsView.cpp moc_mainguiwindow.cpp \
+ moc_myGraphicsScene.cpp \
+ moc_myGraphicsView.cpp
OBJECTS = main.o \
mainguiwindow.o \
myGraphicsScene.o \
myGraphicsRectItem.o \
cornergrabber.o \
+ myGraphicsView.o \
moc_mainguiwindow.o \
- moc_myGraphicsScene.o
+ moc_myGraphicsScene.o \
+ moc_myGraphicsView.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 \
@@ -213,11 +217,13 @@ DIST = /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/mkspecs/features/spec_pre.prf
untitled.pro mainguiwindow.h \
myGraphicsScene.h \
myGraphicsRectItem.h \
- cornergrabber.h main.cpp \
+ cornergrabber.h \
+ myGraphicsView.h main.cpp \
mainguiwindow.cpp \
myGraphicsScene.cpp \
myGraphicsRectItem.cpp \
- cornergrabber.cpp
+ cornergrabber.cpp \
+ myGraphicsView.cpp
QMAKE_TARGET = untitled
DESTDIR =
TARGET = untitled
@@ -550,8 +556,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 $(DISTDIR)/
- $(COPY_FILE) --parents main.cpp mainguiwindow.cpp myGraphicsScene.cpp myGraphicsRectItem.cpp cornergrabber.cpp $(DISTDIR)/
+ $(COPY_FILE) --parents mainguiwindow.h myGraphicsScene.h myGraphicsRectItem.h cornergrabber.h myGraphicsView.h $(DISTDIR)/
+ $(COPY_FILE) --parents main.cpp mainguiwindow.cpp myGraphicsScene.cpp myGraphicsRectItem.cpp cornergrabber.cpp myGraphicsView.cpp $(DISTDIR)/
$(COPY_FILE) --parents mainguiwindow.ui $(DISTDIR)/
@@ -578,9 +584,9 @@ benchmark: first
compiler_rcc_make_all:
compiler_rcc_clean:
-compiler_moc_header_make_all: moc_mainguiwindow.cpp moc_myGraphicsScene.cpp
+compiler_moc_header_make_all: moc_mainguiwindow.cpp moc_myGraphicsScene.cpp moc_myGraphicsView.cpp
compiler_moc_header_clean:
- -$(DEL_FILE) moc_mainguiwindow.cpp moc_myGraphicsScene.cpp
+ -$(DEL_FILE) moc_mainguiwindow.cpp moc_myGraphicsScene.cpp moc_myGraphicsView.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 \
@@ -707,17 +713,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/qbuttongroup.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/QGraphicsView \
- /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qgraphicsview.h \
- /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qpainter.h \
- /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qtextoption.h \
- /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qpen.h \
- /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qscrollarea.h \
- /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qabstractscrollarea.h \
- /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qgraphicsscene.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 \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qabstractscrollarea.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qabstractitemmodel.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qitemselectionmodel.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qabstractitemdelegate.h \
@@ -733,14 +732,20 @@ 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/QSpinBox \
- /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/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 \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/QToolBar \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qtoolbar.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/QWidget \
+ myGraphicsView.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/QGraphicsView \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qgraphicsview.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qpainter.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qtextoption.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qpen.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qscrollarea.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qgraphicsscene.h \
myGraphicsScene.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/QGraphicsScene \
myGraphicsRectItem.h \
@@ -866,13 +871,228 @@ moc_myGraphicsScene.cpp: /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/QG
/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 myGraphicsScene.h -o moc_myGraphicsScene.cpp
+moc_myGraphicsView.cpp: /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/QGraphicsView \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qgraphicsview.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/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/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/qnamespace.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/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/qstringbuilder.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/qalgorithms.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/qobjectdefs_impl.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qpainter.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/qmargins.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/QtCore/qscopedpointer.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/QtGui/qpaintdevice.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/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/QtCore/qstringlist.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/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/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/QtGui/qrgba64.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/QtCore/qobject.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/qobject_impl.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/qtransform.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/QtCore/qvector.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/qpainterpath.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qtextoption.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qpen.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/QtGui/qfontinfo.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/QtWidgets/qscrollarea.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qabstractscrollarea.h \
+ /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/qwidget.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/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 \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qgraphicsscene.h \
+ myGraphicsView.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 myGraphicsView.h -o moc_myGraphicsView.cpp
+
compiler_moc_source_make_all:
compiler_moc_source_clean:
compiler_uic_make_all: ui_mainguiwindow.h
compiler_uic_clean:
-$(DEL_FILE) ui_mainguiwindow.h
ui_mainguiwindow.h: mainguiwindow.ui \
- /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/bin/uic
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/bin/uic \
+ myGraphicsView.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/QGraphicsView \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qgraphicsview.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/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/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/qnamespace.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/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/qstringbuilder.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/qalgorithms.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/qobjectdefs_impl.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qpainter.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/qmargins.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/QtCore/qscopedpointer.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/QtGui/qpaintdevice.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/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/QtCore/qstringlist.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/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/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/QtGui/qrgba64.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/QtCore/qobject.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/qobject_impl.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/qtransform.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/QtCore/qvector.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/qpainterpath.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qtextoption.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qpen.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/QtGui/qfontinfo.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/QtWidgets/qscrollarea.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qabstractscrollarea.h \
+ /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/qwidget.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/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 \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qgraphicsscene.h
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/bin/uic mainguiwindow.ui -o ui_mainguiwindow.h
compiler_yacc_decl_make_all:
@@ -1012,17 +1232,10 @@ main.o: main.cpp mainguiwindow.h \
/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/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/QGraphicsView \
- /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qgraphicsview.h \
- /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qpainter.h \
- /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qtextoption.h \
- /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qpen.h \
- /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qscrollarea.h \
- /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qabstractscrollarea.h \
- /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qgraphicsscene.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 \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qabstractscrollarea.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qabstractitemmodel.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qitemselectionmodel.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qabstractitemdelegate.h \
@@ -1038,14 +1251,20 @@ 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/QSpinBox \
- /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/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 \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/QToolBar \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qtoolbar.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/QWidget \
+ myGraphicsView.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/QGraphicsView \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qgraphicsview.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qpainter.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qtextoption.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qpen.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qscrollarea.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qgraphicsscene.h \
myGraphicsScene.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/QGraphicsScene \
myGraphicsRectItem.h \
@@ -1189,17 +1408,10 @@ mainguiwindow.o: mainguiwindow.cpp mainguiwindow.h \
/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/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/QGraphicsView \
- /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qgraphicsview.h \
- /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qpainter.h \
- /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qtextoption.h \
- /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qpen.h \
- /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qscrollarea.h \
- /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qabstractscrollarea.h \
- /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qgraphicsscene.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 \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qabstractscrollarea.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qabstractitemmodel.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qitemselectionmodel.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qabstractitemdelegate.h \
@@ -1215,14 +1427,20 @@ 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/QSpinBox \
- /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/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 \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/QToolBar \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qtoolbar.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/QWidget \
+ myGraphicsView.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/QGraphicsView \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qgraphicsview.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qpainter.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qtextoption.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qpen.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qscrollarea.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qgraphicsscene.h \
myGraphicsScene.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/QGraphicsScene \
myGraphicsRectItem.h \
@@ -1238,6 +1456,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 \
/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 \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qtextedit.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qtextdocument.h \
@@ -1369,7 +1588,8 @@ myGraphicsScene.o: myGraphicsScene.cpp myGraphicsScene.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/qguiapplication.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/QtGui/qinputmethod.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/QKeyEvent
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o myGraphicsScene.o myGraphicsScene.cpp
myGraphicsRectItem.o: myGraphicsRectItem.cpp myGraphicsRectItem.h \
@@ -1598,12 +1818,123 @@ cornergrabber.o: cornergrabber.cpp cornergrabber.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/QPointF
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o cornergrabber.o cornergrabber.cpp
+myGraphicsView.o: myGraphicsView.cpp myGraphicsView.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/QGraphicsView \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qgraphicsview.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/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/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/qnamespace.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/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/qstringbuilder.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/qalgorithms.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/qobjectdefs_impl.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qpainter.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/qmargins.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/QtCore/qscopedpointer.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/QtGui/qpaintdevice.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/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/QtCore/qstringlist.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/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/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/QtGui/qrgba64.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/QtCore/qobject.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/qobject_impl.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/qtransform.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/QtCore/qvector.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/qpainterpath.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qtextoption.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qpen.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/QtGui/qfontinfo.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/QtWidgets/qscrollarea.h \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qabstractscrollarea.h \
+ /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/qwidget.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/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 \
+ /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qgraphicsscene.h
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o myGraphicsView.o myGraphicsView.cpp
+
moc_mainguiwindow.o: moc_mainguiwindow.cpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_mainguiwindow.o moc_mainguiwindow.cpp
moc_myGraphicsScene.o: moc_myGraphicsScene.cpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_myGraphicsScene.o moc_myGraphicsScene.cpp
+moc_myGraphicsView.o: moc_myGraphicsView.cpp
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_myGraphicsView.o moc_myGraphicsView.cpp
+
####### Install
install: FORCE
diff --git a/crazyflie_ws/sandbox/crazypkg/gui/untitled/cornergrabber.h b/crazyflie_ws/sandbox/crazypkg/gui/untitled/cornergrabber.h
index 2ba43c44bcb01dd5eda583bab3455f9f50211c6b..c6486accf4e81ec240bcbf1157e09bcfa1da4bef 100644
--- a/crazyflie_ws/sandbox/crazypkg/gui/untitled/cornergrabber.h
+++ b/crazyflie_ws/sandbox/crazypkg/gui/untitled/cornergrabber.h
@@ -31,7 +31,7 @@ public:
qreal mouseDownY;
enum {kMouseReleased=0, kMouseDown, kMouseMoving}; ///< define the mouse states
- enum {bottomLeft, topLeft, topRight, bottomRight};
+ enum {noCorner, bottomLeft, topLeft, topRight, bottomRight};
private:
diff --git a/crazyflie_ws/sandbox/crazypkg/gui/untitled/main.o b/crazyflie_ws/sandbox/crazypkg/gui/untitled/main.o
index d56bff813452ec9a4a8adac250fb2d4a805efadb..91b599050ac9307094772f5405f6e9b9d8d0cfb4 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 170bc7062d626f623ffadecb438b50c139fd38bc..4b511579d5907fb58755f235f001c351dfb4d2bf 100644
--- a/crazyflie_ws/sandbox/crazypkg/gui/untitled/mainguiwindow.cpp
+++ b/crazyflie_ws/sandbox/crazypkg/gui/untitled/mainguiwindow.cpp
@@ -1,6 +1,7 @@
#include "mainguiwindow.h"
#include "ui_mainguiwindow.h"
+#include <QObject>
#include <QDoubleSpinBox>
#include <QTextEdit>
#include <QString>
@@ -38,11 +39,11 @@ MainGUIWindow::~MainGUIWindow()
delete ui;
}
-void MainGUIWindow::_refresh_tabs()
+void MainGUIWindow::set_tabs(int n)
{
ui->tabWidget->clear();
std::string str;
- for (int i = 0; i < ui->spinBoxNumCrazyflies->value(); i++)
+ for (int i = 0; i < n; i++)
{
str = "CrazyFly ";
str += std::to_string(i+1);
@@ -58,16 +59,13 @@ void MainGUIWindow::_init()
//scene->setSceneRect(QRectF(QPointF(-100, 100), QSizeF(200, 200)));
ui->graphicsView->setViewportUpdateMode(QGraphicsView::FullViewportUpdate);
- item1 = new QGraphicsRectItem(0,0,100,100);
- item1->setBrush(QBrush(Qt::blue));
- scene->addText("Hello world!");
- // scene->addRect(rect, QPen(Qt::black), QBrush(Qt::blue));
- scene->addItem(item1);
-
ui->graphicsView->setScene(scene);
- ui->spinBoxNumCrazyflies->setMaximum(N_MAX_CRAZYFLIES);
- _refresh_tabs();
+
+ QObject::connect(ui->tabWidget, SIGNAL(tabCloseRequested(int)), scene, SLOT(removeRectangle(int)));
+ QObject::connect(scene, SIGNAL(numRectanglesChanged(int)), this, SLOT(set_tabs(int)));
+ QObject::connect(ui->tabWidget, SIGNAL(currentChanged(int)), scene, SLOT(setSelectedRectangle(int)));
+ QObject::connect(scene, SIGNAL(rectangleSelected(int)), ui->tabWidget, SLOT(setCurrentIndex(int)));
}
#ifndef DEBUG_GUI
@@ -133,6 +131,8 @@ void MainGUIWindow::init()
//refreshScreen();
}
+
+
// void MainGUIWindow::refreshScreen()
// {
// // for(int i=0;i<countPIDControllers;i++)
@@ -942,17 +942,3 @@ void CSetpointQueue::print()
// }
#endif // DEBUG_GUI
-void MainGUIWindow::on_spinBoxNumCrazyflies_valueChanged(int arg1)
-{
- _refresh_tabs();
-}
-
-void MainGUIWindow::on_spinBoxNumCrazyflies_editingFinished()
-{
-
-}
-
-void MainGUIWindow::on_graphicsView_rubberBandChanged(const QRect &viewportRect, const QPointF &fromScenePoint, const QPointF &toScenePoint)
-{
-
-}
diff --git a/crazyflie_ws/sandbox/crazypkg/gui/untitled/mainguiwindow.h b/crazyflie_ws/sandbox/crazypkg/gui/untitled/mainguiwindow.h
index 66f50d3fbbecce9bf295a290a8654b26a146ad89..da862a9f181bf66cf6319f6234869ab24808fb4d 100644
--- a/crazyflie_ws/sandbox/crazypkg/gui/untitled/mainguiwindow.h
+++ b/crazyflie_ws/sandbox/crazypkg/gui/untitled/mainguiwindow.h
@@ -67,6 +67,7 @@ public:
#ifndef DEBUG_GUI
void init();
#endif
+
public slots:
#ifndef DEBUG_GUI
void runCallbacks();
@@ -128,11 +129,8 @@ private slots:
// void on_buttonStop_2_clicked();
#endif
- void on_spinBoxNumCrazyflies_valueChanged(int arg1);
-
- void on_spinBoxNumCrazyflies_editingFinished();
+ void set_tabs(int n);
- void on_graphicsView_rubberBandChanged(const QRect &viewportRect, const QPointF &fromScenePoint, const QPointF &toScenePoint);
private:
@@ -141,7 +139,6 @@ private:
QGraphicsRectItem* item1;
void _init();
- void _refresh_tabs();
#ifndef DEBUG_GUI
// void refreshScreen();
diff --git a/crazyflie_ws/sandbox/crazypkg/gui/untitled/mainguiwindow.o b/crazyflie_ws/sandbox/crazypkg/gui/untitled/mainguiwindow.o
index f0177004607f5f5f71e50fe9c4c8ca6cb5d8c62f..9ba445ae52e9820fcb5f16d0cbe8f62758ebb8df 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 2cb2cf14efcb9de36b6a0019ff1f9353a9639d3f..3257d21d33d327e5abd274f6825e9607bfaa7cd8 100644
--- a/crazyflie_ws/sandbox/crazypkg/gui/untitled/mainguiwindow.ui
+++ b/crazyflie_ws/sandbox/crazypkg/gui/untitled/mainguiwindow.ui
@@ -44,14 +44,17 @@
<property name="currentIndex">
<number>-1</number>
</property>
+ <property name="tabsClosable">
+ <bool>true</bool>
+ </property>
</widget>
</widget>
<widget class="QFrame" name="frame_drawing">
<property name="geometry">
<rect>
- <x>30</x>
+ <x>20</x>
<y>20</y>
- <width>582</width>
+ <width>641</width>
<height>469</height>
</rect>
</property>
@@ -61,13 +64,13 @@
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
- <widget class="QGraphicsView" name="graphicsView">
+ <widget class="myGraphicsView" name="graphicsView">
<property name="geometry">
<rect>
- <x>30</x>
- <y>20</y>
- <width>531</width>
- <height>430</height>
+ <x>10</x>
+ <y>9</y>
+ <width>621</width>
+ <height>451</height>
</rect>
</property>
<property name="mouseTracking">
@@ -78,9 +81,9 @@
<widget class="QFrame" name="frame_3">
<property name="geometry">
<rect>
- <x>629</x>
+ <x>669</x>
<y>21</y>
- <width>581</width>
+ <width>541</width>
<height>469</height>
</rect>
</property>
@@ -91,25 +94,6 @@
<enum>QFrame::Raised</enum>
</property>
</widget>
- <widget class="QSpinBox" name="spinBoxNumCrazyflies">
- <property name="geometry">
- <rect>
- <x>1340</x>
- <y>560</y>
- <width>47</width>
- <height>23</height>
- </rect>
- </property>
- <property name="readOnly">
- <bool>false</bool>
- </property>
- <property name="accelerated">
- <bool>false</bool>
- </property>
- <property name="maximum">
- <number>6</number>
- </property>
- </widget>
</widget>
<widget class="QMenuBar" name="menuBar">
<property name="geometry">
@@ -132,6 +116,13 @@
<widget class="QStatusBar" name="statusBar"/>
</widget>
<layoutdefault spacing="6" margin="11"/>
+ <customwidgets>
+ <customwidget>
+ <class>myGraphicsView</class>
+ <extends>QGraphicsView</extends>
+ <header>myGraphicsView.h</header>
+ </customwidget>
+ </customwidgets>
<resources/>
<connections/>
</ui>
diff --git a/crazyflie_ws/sandbox/crazypkg/gui/untitled/moc_mainguiwindow.cpp b/crazyflie_ws/sandbox/crazypkg/gui/untitled/moc_mainguiwindow.cpp
index 2244cac40190f184987908dfa5fa092650a4417d..ecb548374e79b1edec80ed5ff5a7608d464dea36 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[9];
- char stringdata0[172];
+ QByteArrayData data[4];
+ char stringdata0[26];
};
#define QT_MOC_LITERAL(idx, ofs, len) \
Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \
@@ -30,20 +30,12 @@ struct qt_meta_stringdata_MainGUIWindow_t {
static const qt_meta_stringdata_MainGUIWindow_t qt_meta_stringdata_MainGUIWindow = {
{
QT_MOC_LITERAL(0, 0, 13), // "MainGUIWindow"
-QT_MOC_LITERAL(1, 14, 36), // "on_spinBoxNumCrazyflies_value..."
-QT_MOC_LITERAL(2, 51, 0), // ""
-QT_MOC_LITERAL(3, 52, 4), // "arg1"
-QT_MOC_LITERAL(4, 57, 39), // "on_spinBoxNumCrazyflies_editi..."
-QT_MOC_LITERAL(5, 97, 33), // "on_graphicsView_rubberBandCha..."
-QT_MOC_LITERAL(6, 131, 12), // "viewportRect"
-QT_MOC_LITERAL(7, 144, 14), // "fromScenePoint"
-QT_MOC_LITERAL(8, 159, 12) // "toScenePoint"
+QT_MOC_LITERAL(1, 14, 8), // "set_tabs"
+QT_MOC_LITERAL(2, 23, 0), // ""
+QT_MOC_LITERAL(3, 24, 1) // "n"
},
- "MainGUIWindow\0on_spinBoxNumCrazyflies_valueChanged\0"
- "\0arg1\0on_spinBoxNumCrazyflies_editingFinished\0"
- "on_graphicsView_rubberBandChanged\0"
- "viewportRect\0fromScenePoint\0toScenePoint"
+ "MainGUIWindow\0set_tabs\0\0n"
};
#undef QT_MOC_LITERAL
@@ -53,7 +45,7 @@ static const uint qt_meta_data_MainGUIWindow[] = {
7, // revision
0, // classname
0, 0, // classinfo
- 3, 14, // methods
+ 1, 14, // methods
0, 0, // properties
0, 0, // enums/sets
0, 0, // constructors
@@ -61,14 +53,10 @@ static const uint qt_meta_data_MainGUIWindow[] = {
0, // signalCount
// slots: name, argc, parameters, tag, flags
- 1, 1, 29, 2, 0x08 /* Private */,
- 4, 0, 32, 2, 0x08 /* Private */,
- 5, 3, 33, 2, 0x08 /* Private */,
+ 1, 1, 19, 2, 0x08 /* Private */,
// slots: parameters
QMetaType::Void, QMetaType::Int, 3,
- QMetaType::Void,
- QMetaType::Void, QMetaType::QRect, QMetaType::QPointF, QMetaType::QPointF, 6, 7, 8,
0 // eod
};
@@ -79,9 +67,7 @@ void MainGUIWindow::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _i
MainGUIWindow *_t = static_cast<MainGUIWindow *>(_o);
Q_UNUSED(_t)
switch (_id) {
- case 0: _t->on_spinBoxNumCrazyflies_valueChanged((*reinterpret_cast< int(*)>(_a[1]))); break;
- case 1: _t->on_spinBoxNumCrazyflies_editingFinished(); break;
- case 2: _t->on_graphicsView_rubberBandChanged((*reinterpret_cast< const QRect(*)>(_a[1])),(*reinterpret_cast< const QPointF(*)>(_a[2])),(*reinterpret_cast< const QPointF(*)>(_a[3]))); break;
+ case 0: _t->set_tabs((*reinterpret_cast< int(*)>(_a[1]))); break;
default: ;
}
}
@@ -112,13 +98,13 @@ int MainGUIWindow::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
if (_id < 0)
return _id;
if (_c == QMetaObject::InvokeMetaMethod) {
- if (_id < 3)
+ if (_id < 1)
qt_static_metacall(this, _c, _id, _a);
- _id -= 3;
+ _id -= 1;
} else if (_c == QMetaObject::RegisterMethodArgumentMetaType) {
- if (_id < 3)
+ if (_id < 1)
*reinterpret_cast<int*>(_a[0]) = -1;
- _id -= 3;
+ _id -= 1;
}
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 b9652dbb27fc6691da546f32ca37d7f1a870c276..d3479640afe9702aade52dab55426989089e33c1 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.cpp b/crazyflie_ws/sandbox/crazypkg/gui/untitled/moc_myGraphicsScene.cpp
index 3e763a3b383d25b431ea495871e4f53b4984bdc7..3503f77da07dd7f48d353296f855025b79561d99 100644
--- a/crazyflie_ws/sandbox/crazypkg/gui/untitled/moc_myGraphicsScene.cpp
+++ b/crazyflie_ws/sandbox/crazypkg/gui/untitled/moc_myGraphicsScene.cpp
@@ -19,8 +19,8 @@
QT_BEGIN_MOC_NAMESPACE
struct qt_meta_stringdata_myGraphicsScene_t {
- QByteArrayData data[1];
- char stringdata0[16];
+ QByteArrayData data[8];
+ char stringdata0[106];
};
#define QT_MOC_LITERAL(idx, ofs, len) \
Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \
@@ -29,10 +29,19 @@ struct qt_meta_stringdata_myGraphicsScene_t {
)
static const qt_meta_stringdata_myGraphicsScene_t qt_meta_stringdata_myGraphicsScene = {
{
-QT_MOC_LITERAL(0, 0, 15) // "myGraphicsScene"
+QT_MOC_LITERAL(0, 0, 15), // "myGraphicsScene"
+QT_MOC_LITERAL(1, 16, 20), // "numRectanglesChanged"
+QT_MOC_LITERAL(2, 37, 0), // ""
+QT_MOC_LITERAL(3, 38, 6), // "newNum"
+QT_MOC_LITERAL(4, 45, 17), // "rectangleSelected"
+QT_MOC_LITERAL(5, 63, 5), // "index"
+QT_MOC_LITERAL(6, 69, 15), // "removeRectangle"
+QT_MOC_LITERAL(7, 85, 20) // "setSelectedRectangle"
},
- "myGraphicsScene"
+ "myGraphicsScene\0numRectanglesChanged\0"
+ "\0newNum\0rectangleSelected\0index\0"
+ "removeRectangle\0setSelectedRectangle"
};
#undef QT_MOC_LITERAL
@@ -42,22 +51,62 @@ static const uint qt_meta_data_myGraphicsScene[] = {
7, // revision
0, // classname
0, 0, // classinfo
- 0, 0, // methods
+ 4, 14, // methods
0, 0, // properties
0, 0, // enums/sets
0, 0, // constructors
0, // flags
- 0, // signalCount
+ 2, // signalCount
+
+ // signals: name, argc, parameters, tag, flags
+ 1, 1, 34, 2, 0x06 /* Public */,
+ 4, 1, 37, 2, 0x06 /* Public */,
+
+ // slots: name, argc, parameters, tag, flags
+ 6, 1, 40, 2, 0x0a /* Public */,
+ 7, 1, 43, 2, 0x0a /* Public */,
+
+ // signals: parameters
+ QMetaType::Void, QMetaType::Int, 3,
+ QMetaType::Void, QMetaType::Int, 5,
+
+ // slots: parameters
+ QMetaType::Void, QMetaType::Int, 5,
+ QMetaType::Void, QMetaType::Int, 5,
0 // eod
};
void myGraphicsScene::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a)
{
- Q_UNUSED(_o);
- Q_UNUSED(_id);
- Q_UNUSED(_c);
- Q_UNUSED(_a);
+ if (_c == QMetaObject::InvokeMetaMethod) {
+ myGraphicsScene *_t = static_cast<myGraphicsScene *>(_o);
+ Q_UNUSED(_t)
+ switch (_id) {
+ case 0: _t->numRectanglesChanged((*reinterpret_cast< int(*)>(_a[1]))); break;
+ case 1: _t->rectangleSelected((*reinterpret_cast< int(*)>(_a[1]))); break;
+ case 2: _t->removeRectangle((*reinterpret_cast< int(*)>(_a[1]))); break;
+ case 3: _t->setSelectedRectangle((*reinterpret_cast< int(*)>(_a[1]))); break;
+ default: ;
+ }
+ } else if (_c == QMetaObject::IndexOfMethod) {
+ int *result = reinterpret_cast<int *>(_a[0]);
+ void **func = reinterpret_cast<void **>(_a[1]);
+ {
+ typedef void (myGraphicsScene::*_t)(int );
+ if (*reinterpret_cast<_t *>(func) == static_cast<_t>(&myGraphicsScene::numRectanglesChanged)) {
+ *result = 0;
+ return;
+ }
+ }
+ {
+ typedef void (myGraphicsScene::*_t)(int );
+ if (*reinterpret_cast<_t *>(func) == static_cast<_t>(&myGraphicsScene::rectangleSelected)) {
+ *result = 1;
+ return;
+ }
+ }
+ }
}
const QMetaObject myGraphicsScene::staticMetaObject = {
@@ -84,6 +133,29 @@ int myGraphicsScene::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
_id = QGraphicsScene::qt_metacall(_c, _id, _a);
if (_id < 0)
return _id;
+ if (_c == QMetaObject::InvokeMetaMethod) {
+ if (_id < 4)
+ qt_static_metacall(this, _c, _id, _a);
+ _id -= 4;
+ } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) {
+ if (_id < 4)
+ *reinterpret_cast<int*>(_a[0]) = -1;
+ _id -= 4;
+ }
return _id;
}
+
+// SIGNAL 0
+void myGraphicsScene::numRectanglesChanged(int _t1)
+{
+ void *_a[] = { Q_NULLPTR, const_cast<void*>(reinterpret_cast<const void*>(&_t1)) };
+ QMetaObject::activate(this, &staticMetaObject, 0, _a);
+}
+
+// SIGNAL 1
+void myGraphicsScene::rectangleSelected(int _t1)
+{
+ void *_a[] = { Q_NULLPTR, const_cast<void*>(reinterpret_cast<const void*>(&_t1)) };
+ QMetaObject::activate(this, &staticMetaObject, 1, _a);
+}
QT_END_MOC_NAMESPACE
diff --git a/crazyflie_ws/sandbox/crazypkg/gui/untitled/moc_myGraphicsScene.o b/crazyflie_ws/sandbox/crazypkg/gui/untitled/moc_myGraphicsScene.o
index 75606480252a6552d463f70f8a395d06358f6f40..0e152317fec20d9467c7bd73286a7cd04eade41f 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/moc_myGraphicsView.cpp b/crazyflie_ws/sandbox/crazypkg/gui/untitled/moc_myGraphicsView.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..a92ac660a505f0b6540119d2ecd3c04457287fe6
--- /dev/null
+++ b/crazyflie_ws/sandbox/crazypkg/gui/untitled/moc_myGraphicsView.cpp
@@ -0,0 +1,89 @@
+/****************************************************************************
+** Meta object code from reading C++ file 'myGraphicsView.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 "myGraphicsView.h"
+#include <QtCore/qbytearray.h>
+#include <QtCore/qmetatype.h>
+#if !defined(Q_MOC_OUTPUT_REVISION)
+#error "The header file 'myGraphicsView.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_myGraphicsView_t {
+ QByteArrayData data[1];
+ char stringdata0[15];
+};
+#define QT_MOC_LITERAL(idx, ofs, len) \
+ Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \
+ qptrdiff(offsetof(qt_meta_stringdata_myGraphicsView_t, stringdata0) + ofs \
+ - idx * sizeof(QByteArrayData)) \
+ )
+static const qt_meta_stringdata_myGraphicsView_t qt_meta_stringdata_myGraphicsView = {
+ {
+QT_MOC_LITERAL(0, 0, 14) // "myGraphicsView"
+
+ },
+ "myGraphicsView"
+};
+#undef QT_MOC_LITERAL
+
+static const uint qt_meta_data_myGraphicsView[] = {
+
+ // content:
+ 7, // revision
+ 0, // classname
+ 0, 0, // classinfo
+ 0, 0, // methods
+ 0, 0, // properties
+ 0, 0, // enums/sets
+ 0, 0, // constructors
+ 0, // flags
+ 0, // signalCount
+
+ 0 // eod
+};
+
+void myGraphicsView::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a)
+{
+ Q_UNUSED(_o);
+ Q_UNUSED(_id);
+ Q_UNUSED(_c);
+ Q_UNUSED(_a);
+}
+
+const QMetaObject myGraphicsView::staticMetaObject = {
+ { &QGraphicsView::staticMetaObject, qt_meta_stringdata_myGraphicsView.data,
+ qt_meta_data_myGraphicsView, qt_static_metacall, Q_NULLPTR, Q_NULLPTR}
+};
+
+
+const QMetaObject *myGraphicsView::metaObject() const
+{
+ return QObject::d_ptr->metaObject ? QObject::d_ptr->dynamicMetaObject() : &staticMetaObject;
+}
+
+void *myGraphicsView::qt_metacast(const char *_clname)
+{
+ if (!_clname) return Q_NULLPTR;
+ if (!strcmp(_clname, qt_meta_stringdata_myGraphicsView.stringdata0))
+ return static_cast<void*>(const_cast< myGraphicsView*>(this));
+ return QGraphicsView::qt_metacast(_clname);
+}
+
+int myGraphicsView::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
+{
+ _id = QGraphicsView::qt_metacall(_c, _id, _a);
+ if (_id < 0)
+ return _id;
+ return _id;
+}
+QT_END_MOC_NAMESPACE
diff --git a/crazyflie_ws/sandbox/crazypkg/gui/untitled/moc_myGraphicsView.o b/crazyflie_ws/sandbox/crazypkg/gui/untitled/moc_myGraphicsView.o
new file mode 100644
index 0000000000000000000000000000000000000000..b00b21ecd8e7123df4db1947ce5a060c52236995
Binary files /dev/null and b/crazyflie_ws/sandbox/crazypkg/gui/untitled/moc_myGraphicsView.o differ
diff --git a/crazyflie_ws/sandbox/crazypkg/gui/untitled/myGraphicsRectItem.cpp b/crazyflie_ws/sandbox/crazypkg/gui/untitled/myGraphicsRectItem.cpp
index 8b251cbf03d4b4c4e1225a41640179d9bb0f358d..07cced389656f604c665aaffe7842a58a17a5eb0 100644
--- a/crazyflie_ws/sandbox/crazypkg/gui/untitled/myGraphicsRectItem.cpp
+++ b/crazyflie_ws/sandbox/crazypkg/gui/untitled/myGraphicsRectItem.cpp
@@ -12,11 +12,13 @@ myGraphicsRectItem::myGraphicsRectItem(const QRectF & rect, QGraphicsItem * pare
{
this->setFlag(QGraphicsItem::ItemIsSelectable);
this->setFlag(QGraphicsItem::ItemIsMovable);
+ this->setFlag(QGraphicsItem::ItemSendsScenePositionChanges);
pen = new QPen(Qt::red);
brush = new QBrush(Qt::red);
tmp_rect = 0;
_grabbers_created = false;
+ resize_mode = false;
// this->setAcceptHoverEvents(true);
}
@@ -49,6 +51,20 @@ QVariant myGraphicsRectItem::itemChange(GraphicsItemChange change, const QVarian
deleteGrabbers();
}
}
+ if (change == QGraphicsItem::ItemPositionChange && scene()) // with this, block movement of object when we are hovering through cornergrabbers
+ {
+ if(checkCornerGrabbers() == CornerGrabber::noCorner)
+ {
+ qDebug("move now!");
+ return QPointF(value.toPointF().x(), value.toPointF().y());
+ }
+ else
+ {
+ qDebug("dont move now!");
+ return QPointF(pos().x(), pos().y());
+ }
+ }
+
return QGraphicsItem::itemChange(change, value);
}
@@ -58,7 +74,7 @@ bool myGraphicsRectItem::grabbersAreCreated()
return _grabbers_created;
}
-void myGraphicsRectItem::setCornerPositions()
+void myGraphicsRectItem::setCornerPositions() //need to call this function whenever we chnge the size of the rectangle
{
QRectF rect = this->rect();
@@ -101,7 +117,15 @@ int myGraphicsRectItem::checkCornerGrabbers()
else if( _bottomRight_corner->isActive())
return CornerGrabber::bottomRight;
else
- return 20;
+ return CornerGrabber::noCorner; //0 is none
+}
+
+bool myGraphicsRectItem::anyGrabber()
+{
+ if(checkCornerGrabbers() != CornerGrabber::noCorner)
+ return true;
+ else
+ return false;
}
void myGraphicsRectItem::mousePressEvent(QGraphicsSceneMouseEvent *mouseEvent)
@@ -109,38 +133,64 @@ void myGraphicsRectItem::mousePressEvent(QGraphicsSceneMouseEvent *mouseEvent)
if (mouseEvent->button() != Qt::LeftButton)
return;
- createGrabbers(); //This is just in case they have not been created by now.
+ createGrabbers(); //This is just in case they have not been created by now. We have a creator guardian anyhow
- switch(checkCornerGrabbers())
+ if(anyGrabber())
{
- case CornerGrabber::bottomLeft:
- qDebug("bottomLeft");
- mouseEvent->setAccepted(true);
- break;
- case CornerGrabber::topLeft:
- qDebug("topLeft");
- mouseEvent->setAccepted(true);
- break;
- case CornerGrabber::topRight:
- qDebug("topRight");
- mouseEvent->setAccepted(true);
- break;
- case CornerGrabber::bottomRight:
- qDebug("bottomRight");
- mouseEvent->setAccepted(true);
- break;
- default:
- qDebug("No corner");
- // Normal case here, mouse not in corner grabbers
- QGraphicsRectItem::mousePressEvent(mouseEvent);
- break;
+ resize_mode = true;
}
- // TODO: check if over handlers, if, resize mode
+ QGraphicsRectItem::mousePressEvent(mouseEvent);
}
void myGraphicsRectItem::mouseMoveEvent(QGraphicsSceneMouseEvent *mouseEvent)
{
this->prepareGeometryChange();
+ if(resize_mode)
+ {
+ switch(checkCornerGrabbers())
+ {
+ case CornerGrabber::bottomLeft:
+ {
+ qDebug("bottomLeft");
+ QRectF resize_rect = this->rect();
+ resize_rect.setBottomLeft(mouseEvent->pos());
+ this->setRect(resize_rect.normalized());
+ setCornerPositions();
+ break;
+ }
+ case CornerGrabber::topLeft:
+ {
+ qDebug("topLeft");
+ QRectF resize_rect = this->rect();
+ resize_rect.setTopLeft(mouseEvent->pos());
+ this->setRect(resize_rect.normalized());
+ setCornerPositions();
+ break;
+ }
+ case CornerGrabber::topRight:
+ {
+ qDebug("topRight");
+ QRectF resize_rect = this->rect();
+ resize_rect.setTopRight(mouseEvent->pos());
+ this->setRect(resize_rect.normalized());
+ setCornerPositions();
+ break;
+ }
+ case CornerGrabber::bottomRight:
+ {
+ qDebug("bottomRight");
+ QRectF resize_rect = this->rect();
+ resize_rect.setBottomRight(mouseEvent->pos());
+ this->setRect(resize_rect.normalized());
+ setCornerPositions();
+ break;
+ }
+ case CornerGrabber::noCorner:
+ qDebug("No corner. Should never enter here");
+ default:
+ break;
+ }
+ }
QGraphicsRectItem::mouseMoveEvent(mouseEvent);
}
@@ -150,5 +200,9 @@ void myGraphicsRectItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *mouseEvent)
if (mouseEvent->button() != Qt::LeftButton)
return;
// TODO: stop resize mode
+ if(resize_mode)
+ {
+ resize_mode = false;
+ }
QGraphicsRectItem::mouseReleaseEvent(mouseEvent);
}
diff --git a/crazyflie_ws/sandbox/crazypkg/gui/untitled/myGraphicsRectItem.h b/crazyflie_ws/sandbox/crazypkg/gui/untitled/myGraphicsRectItem.h
index 49607f17911988c7ab859edb369debac58329e43..e6602e7c596c4e28f7f96ff82f15cbd52ce66431 100644
--- a/crazyflie_ws/sandbox/crazypkg/gui/untitled/myGraphicsRectItem.h
+++ b/crazyflie_ws/sandbox/crazypkg/gui/untitled/myGraphicsRectItem.h
@@ -28,6 +28,7 @@ protected:
private:
void setCornerPositions();
+ bool anyGrabber();
int checkCornerGrabbers();
void createGrabbers();
bool grabbersAreCreated();
@@ -46,6 +47,8 @@ private:
CornerGrabber* _bottomRight_corner;
bool _grabbers_created;
+ bool resize_mode;
+
};
#endif
diff --git a/crazyflie_ws/sandbox/crazypkg/gui/untitled/myGraphicsRectItem.o b/crazyflie_ws/sandbox/crazypkg/gui/untitled/myGraphicsRectItem.o
index 81d90b2b3755731591140c4d6e7b806814de6d97..233510b714c143b864fc0992e55b02bc8f8c377b 100644
Binary files a/crazyflie_ws/sandbox/crazypkg/gui/untitled/myGraphicsRectItem.o and b/crazyflie_ws/sandbox/crazypkg/gui/untitled/myGraphicsRectItem.o differ
diff --git a/crazyflie_ws/sandbox/crazypkg/gui/untitled/myGraphicsScene.cpp b/crazyflie_ws/sandbox/crazypkg/gui/untitled/myGraphicsScene.cpp
index 50d0f290e0849d738a297b171f8fa9b84b8c595f..8b8a7c7b09cc4830b81859ee9b0ff8164d6b7d53 100644
--- a/crazyflie_ws/sandbox/crazypkg/gui/untitled/myGraphicsScene.cpp
+++ b/crazyflie_ws/sandbox/crazypkg/gui/untitled/myGraphicsScene.cpp
@@ -3,6 +3,7 @@
#include <QGraphicsSceneMouseEvent>
#include <QRect>
#include <QApplication>
+#include <QKeyEvent>
myGraphicsScene::myGraphicsScene(QObject *parent)
: QGraphicsScene(parent)
@@ -15,6 +16,49 @@ myGraphicsScene::myGraphicsScene(QObject *parent)
// firstClick = true;
}
+
+void myGraphicsScene::keyPressEvent(QKeyEvent * keyEvent)
+{
+ if(keyEvent->key() == Qt::Key_Delete)
+ {
+ qDebug("del key pressed");
+ for(unsigned int i = 0; i < rectangles.size(); i++)
+ {
+ if(rectangles[i]->isSelected())
+ {
+ qDebug("selectedRectangle: %d", i);
+ removeRectangle(i);
+ }
+ }
+ }
+ QGraphicsScene::keyPressEvent(keyEvent);
+}
+
+void myGraphicsScene::setSelectedRectangle(int index)
+{
+ for(unsigned int i = 0; i < rectangles.size(); i++)
+ {
+ rectangles[i]->setSelected(false);
+ if(index == i)
+ {
+ rectangles[index]->setSelected(true);
+ }
+ }
+}
+
+int myGraphicsScene::checkSelectedRectangle()
+{
+ for(unsigned int i = 0; i < rectangles.size(); i++)
+ {
+ if(rectangles[i]->isSelected())
+ {
+ qDebug("rectangle selected index = %d", i);
+ return i;
+ }
+ }
+ return -1;
+}
+
void myGraphicsScene::mousePressEvent(QGraphicsSceneMouseEvent *mouseEvent)
{
if (mouseEvent->button() != Qt::LeftButton)
@@ -29,6 +73,7 @@ void myGraphicsScene::mousePressEvent(QGraphicsSceneMouseEvent *mouseEvent)
addItem(tmp_rect_item);
}
+
QGraphicsScene::mousePressEvent(mouseEvent);
}
@@ -43,27 +88,37 @@ void myGraphicsScene::mouseMoveEvent(QGraphicsSceneMouseEvent *mouseEvent)
QGraphicsScene::mouseMoveEvent(mouseEvent);
}
+void myGraphicsScene::addRectangleToVector(myGraphicsRectItem* rect)
+{
+ rectangles.push_back(rect);
+ emit numRectanglesChanged(rectangles.size());
+}
+
+void myGraphicsScene::removeRectangle(int index)
+{
+ this->removeItem(rectangles[index]);
+ rectangles.erase(rectangles.begin() + index);
+ emit numRectanglesChanged(rectangles.size());
+}
+
void myGraphicsScene::mouseReleaseEvent(QGraphicsSceneMouseEvent *mouseEvent)
{
if(startedRect)
{
if (mouseEvent->button() != Qt::LeftButton)
return;
-
- // Drag and drop approach:
-
// TODO: If too small, etc etc, dont add it to the container and remove it
tmp_rect_item->setRect(tmp_rect_item->rect().normalized());
- rectangles.push_back(tmp_rect_item);
-
+ addRectangleToVector(tmp_rect_item);
tmp_rect = 0;
startedRect = false;
-
- // update();
-
}
-
+ int selected_rect = checkSelectedRectangle();
+ if(selected_rect != -1)
+ {
+ emit rectangleSelected(selected_rect);
+ }
QGraphicsScene::mouseReleaseEvent(mouseEvent);
}
diff --git a/crazyflie_ws/sandbox/crazypkg/gui/untitled/myGraphicsScene.h b/crazyflie_ws/sandbox/crazypkg/gui/untitled/myGraphicsScene.h
index 337ea706c4a4a16a3adeb50b054bff720cbeca87..21da8619926b31fc14c4e5ee43fbc2a299dee6c9 100644
--- a/crazyflie_ws/sandbox/crazypkg/gui/untitled/myGraphicsScene.h
+++ b/crazyflie_ws/sandbox/crazypkg/gui/untitled/myGraphicsScene.h
@@ -17,19 +17,29 @@ class myGraphicsScene : public QGraphicsScene
Q_OBJECT
public:
+
explicit myGraphicsScene(QObject *parent = 0);
std::vector<myGraphicsRectItem*> rectangles;
public slots:
+ void removeRectangle(int index);
+ void setSelectedRectangle(int index);
signals:
+ void numRectanglesChanged(int newNum);
+ void rectangleSelected(int index);
protected:
void mousePressEvent(QGraphicsSceneMouseEvent *mouseEvent) override;
void mouseMoveEvent(QGraphicsSceneMouseEvent *mouseEvent) override;
void mouseReleaseEvent(QGraphicsSceneMouseEvent *mouseEvent) override;
+ void keyPressEvent(QKeyEvent * keyEvent) override;
+
private:
+ void addRectangleToVector(myGraphicsRectItem* rect);
+ int checkSelectedRectangle();
+
QPen* pen;
QBrush* brush;
QRectF* tmp_rect;
@@ -37,8 +47,6 @@ private:
QPointF* p1;
QPointF* p2;
- // bool firstClick;
-
bool startedRect;
};
diff --git a/crazyflie_ws/sandbox/crazypkg/gui/untitled/myGraphicsScene.o b/crazyflie_ws/sandbox/crazypkg/gui/untitled/myGraphicsScene.o
index fda44f5eca115cfcafe578c91e2c2429a16682de..892d51071f79908b78e3446347cba2ad5eb78a4d 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
new file mode 100644
index 0000000000000000000000000000000000000000..a8f18c9df307a9ba3cf401360ab2d0d17e17a264
--- /dev/null
+++ b/crazyflie_ws/sandbox/crazypkg/gui/untitled/myGraphicsView.cpp
@@ -0,0 +1,62 @@
+#include "myGraphicsView.h"
+
+#include <QApplication>
+#include <QMouseEvent>
+
+myGraphicsView::myGraphicsView(QWidget *parent)
+ : QGraphicsView(parent)
+{
+ translation_mode = false;
+}
+
+
+void myGraphicsView::wheelEvent(QWheelEvent *event)
+{
+
+ if(Qt::ControlModifier == QApplication::keyboardModifiers())
+ {
+ this->setTransformationAnchor(QGraphicsView::AnchorUnderMouse);
+ // Scale the view / do the zoom
+ double scaleFactor = 1.15;
+ if(event->delta() > 0) {
+ // Zoom in
+ this-> scale(scaleFactor, scaleFactor);
+
+ } else {
+ // Zooming out
+ this->scale(1.0 / scaleFactor, 1.0 / scaleFactor);
+ }
+ }
+ else
+ {
+ QGraphicsView::wheelEvent(event); // dont propagate if we are zooming. If we propagate, we will also scroll
+ }
+}
+
+void myGraphicsView::mousePressEvent(QMouseEvent *mouseEvent)
+{
+ if (mouseEvent->button() == Qt::MiddleButton)
+ {
+ translation_mode = true;
+ tmp_point = new QPointF(mouseEvent->localPos());
+ }
+ QGraphicsView::mousePressEvent(mouseEvent);
+}
+
+void myGraphicsView::mouseMoveEvent(QMouseEvent *mouseEvent)
+{
+ if(translation_mode)
+ {
+ translate_dx = mouseEvent->localPos().x() - tmp_point->x();
+ translate_dy = mouseEvent->localPos().y() - tmp_point->y();
+ this->translate(translate_dx, translate_dy);
+ }
+ QGraphicsView::mouseMoveEvent(mouseEvent);
+}
+
+
+void myGraphicsView::mouseReleaseEvent(QMouseEvent *mouseEvent)
+{
+ translation_mode = false;
+ QGraphicsView::mouseReleaseEvent(mouseEvent);
+}
diff --git a/crazyflie_ws/sandbox/crazypkg/gui/untitled/myGraphicsView.h b/crazyflie_ws/sandbox/crazypkg/gui/untitled/myGraphicsView.h
new file mode 100644
index 0000000000000000000000000000000000000000..a9983705e9a62f4b6f4d5ced0393867753e7fb85
--- /dev/null
+++ b/crazyflie_ws/sandbox/crazypkg/gui/untitled/myGraphicsView.h
@@ -0,0 +1,36 @@
+#ifndef MYGRAPHICSVIEW_H
+#define MYGRAPHICSVIEW_H
+
+#include <vector>
+
+#include <QGraphicsView>
+#include <QWheelEvent>
+
+class myGraphicsView : public QGraphicsView
+{
+ Q_OBJECT
+
+public:
+
+ explicit myGraphicsView(QWidget *parent = 0);
+
+public slots:
+
+signals:
+
+protected:
+ void mousePressEvent(QMouseEvent *mouseEvent) override;
+ void mouseMoveEvent(QMouseEvent *mouseEvent) override;
+ void mouseReleaseEvent(QMouseEvent *mouseEvent) override;
+
+ virtual void wheelEvent(QWheelEvent* event) override; // TODO: right now, do it in the whole MainGUIWindow. Afterwards maybe do this only in the QGraphicsScene (need to do own class)
+
+private:
+
+ bool translation_mode;
+ qreal translate_dx;
+ qreal translate_dy;
+ QPointF* tmp_point;
+};
+
+#endif
diff --git a/crazyflie_ws/sandbox/crazypkg/gui/untitled/myGraphicsView.o b/crazyflie_ws/sandbox/crazypkg/gui/untitled/myGraphicsView.o
new file mode 100644
index 0000000000000000000000000000000000000000..4b5cdea38f2410b8dcdea73321cf8cc01ec5e968
Binary files /dev/null and b/crazyflie_ws/sandbox/crazypkg/gui/untitled/myGraphicsView.o differ
diff --git a/crazyflie_ws/sandbox/crazypkg/gui/untitled/ui_mainguiwindow.h b/crazyflie_ws/sandbox/crazypkg/gui/untitled/ui_mainguiwindow.h
index 76c39f15638db06e346b6ad31d3ce3ca3c8adb82..12a04b214644b1509cfb8c1201ee6bf206ca0b44 100644
--- a/crazyflie_ws/sandbox/crazypkg/gui/untitled/ui_mainguiwindow.h
+++ b/crazyflie_ws/sandbox/crazypkg/gui/untitled/ui_mainguiwindow.h
@@ -14,15 +14,14 @@
#include <QtWidgets/QApplication>
#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QFrame>
-#include <QtWidgets/QGraphicsView>
#include <QtWidgets/QHeaderView>
#include <QtWidgets/QMainWindow>
#include <QtWidgets/QMenuBar>
-#include <QtWidgets/QSpinBox>
#include <QtWidgets/QStatusBar>
#include <QtWidgets/QTabWidget>
#include <QtWidgets/QToolBar>
#include <QtWidgets/QWidget>
+#include "myGraphicsView.h"
QT_BEGIN_NAMESPACE
@@ -33,9 +32,8 @@ public:
QFrame *frame;
QTabWidget *tabWidget;
QFrame *frame_drawing;
- QGraphicsView *graphicsView;
+ myGraphicsView *graphicsView;
QFrame *frame_3;
- QSpinBox *spinBoxNumCrazyflies;
QMenuBar *menuBar;
QToolBar *mainToolBar;
QStatusBar *statusBar;
@@ -56,26 +54,21 @@ public:
tabWidget->setObjectName(QStringLiteral("tabWidget"));
tabWidget->setGeometry(QRect(20, 19, 1131, 401));
tabWidget->setLayoutDirection(Qt::LeftToRight);
+ tabWidget->setTabsClosable(true);
frame_drawing = new QFrame(centralWidget);
frame_drawing->setObjectName(QStringLiteral("frame_drawing"));
- frame_drawing->setGeometry(QRect(30, 20, 582, 469));
+ frame_drawing->setGeometry(QRect(20, 20, 641, 469));
frame_drawing->setFrameShape(QFrame::StyledPanel);
frame_drawing->setFrameShadow(QFrame::Raised);
- graphicsView = new QGraphicsView(frame_drawing);
+ graphicsView = new myGraphicsView(frame_drawing);
graphicsView->setObjectName(QStringLiteral("graphicsView"));
- graphicsView->setGeometry(QRect(30, 20, 531, 430));
+ graphicsView->setGeometry(QRect(10, 9, 621, 451));
graphicsView->setMouseTracking(true);
frame_3 = new QFrame(centralWidget);
frame_3->setObjectName(QStringLiteral("frame_3"));
- frame_3->setGeometry(QRect(629, 21, 581, 469));
+ frame_3->setGeometry(QRect(669, 21, 541, 469));
frame_3->setFrameShape(QFrame::StyledPanel);
frame_3->setFrameShadow(QFrame::Raised);
- spinBoxNumCrazyflies = new QSpinBox(centralWidget);
- spinBoxNumCrazyflies->setObjectName(QStringLiteral("spinBoxNumCrazyflies"));
- spinBoxNumCrazyflies->setGeometry(QRect(1340, 560, 47, 23));
- spinBoxNumCrazyflies->setReadOnly(false);
- spinBoxNumCrazyflies->setAccelerated(false);
- spinBoxNumCrazyflies->setMaximum(6);
MainGUIWindow->setCentralWidget(centralWidget);
menuBar = new QMenuBar(MainGUIWindow);
menuBar->setObjectName(QStringLiteral("menuBar"));
diff --git a/crazyflie_ws/sandbox/crazypkg/gui/untitled/untitled b/crazyflie_ws/sandbox/crazypkg/gui/untitled/untitled
index 3a7fc1d6b3f744be61712c60199af0b799693d27..43cb3701f732ab591496915931c98ff3518d9632 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 a54ebb3fa559ad32f05e83bbbf09024c8964c070..367559319175b3c2dd798f0979eed89d1794f72b 100644
--- a/crazyflie_ws/sandbox/crazypkg/gui/untitled/untitled.pro
+++ b/crazyflie_ws/sandbox/crazypkg/gui/untitled/untitled.pro
@@ -17,10 +17,12 @@ SOURCES += main.cpp\
myGraphicsScene.cpp \
myGraphicsRectItem.cpp \
cornergrabber.cpp \
+ myGraphicsView.cpp
HEADERS += mainguiwindow.h \
myGraphicsScene.h \
myGraphicsRectItem.h \
- cornergrabber.h
+ cornergrabber.h \
+ myGraphicsView.h
FORMS += mainguiwindow.ui
diff --git a/crazyflie_ws/sandbox/crazypkg/gui/untitled/untitled.pro.user b/crazyflie_ws/sandbox/crazypkg/gui/untitled/untitled.pro.user
index 0a187c896bb321402f86b386f179cdafdb72b235..3f5cb11714e2fe96ad83988938a6949df22d5c4e 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-03-30T17:30:23. -->
+<!-- Written by QtCreator 4.0.2, 2017-04-05T17:15:20. -->
<qtcreator>
<data>
<variable>EnvironmentId</variable>