Commit 47b093f9 authored by roangel's avatar roangel
Browse files

Added table creation mode, fixed some other details. Next: decide how we want...

Added table creation mode, fixed some other details. Next: decide how we want to manage what we want to see, the modes, etc etc..
parent e6ed9ee6
......@@ -54,7 +54,8 @@ SOURCES = main.cpp \
myGraphicsRectItem.cpp \
cornergrabber.cpp \
myGraphicsView.cpp \
crazyFlyZone.cpp moc_mainguiwindow.cpp \
crazyFlyZone.cpp \
tablePiece.cpp moc_mainguiwindow.cpp \
moc_myGraphicsScene.cpp \
moc_myGraphicsView.cpp
OBJECTS = main.o \
......@@ -64,6 +65,7 @@ OBJECTS = main.o \
cornergrabber.o \
myGraphicsView.o \
crazyFlyZone.o \
tablePiece.o \
moc_mainguiwindow.o \
moc_myGraphicsScene.o \
moc_myGraphicsView.o
......@@ -221,13 +223,15 @@ DIST = /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/mkspecs/features/spec_pre.prf
myGraphicsRectItem.h \
cornergrabber.h \
myGraphicsView.h \
crazyFlyZone.h main.cpp \
crazyFlyZone.h \
tablePiece.h main.cpp \
mainguiwindow.cpp \
myGraphicsScene.cpp \
myGraphicsRectItem.cpp \
cornergrabber.cpp \
myGraphicsView.cpp \
crazyFlyZone.cpp
crazyFlyZone.cpp \
tablePiece.cpp
QMAKE_TARGET = untitled
DESTDIR =
TARGET = untitled
......@@ -560,8 +564,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 $(DISTDIR)/
$(COPY_FILE) --parents main.cpp mainguiwindow.cpp myGraphicsScene.cpp myGraphicsRectItem.cpp cornergrabber.cpp myGraphicsView.cpp crazyFlyZone.cpp $(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.ui $(DISTDIR)/
......@@ -754,8 +758,8 @@ moc_mainguiwindow.cpp: /home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/QMai
myGraphicsScene.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/QGraphicsScene \
crazyFlyZone.h \
myGraphicsRectItem.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/QGraphicsSimpleTextItem \
myGraphicsRectItem.h \
cornergrabber.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/QObject \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/QGraphicsItem \
......@@ -767,6 +771,7 @@ 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/QPainter \
/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 \
mainguiwindow.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 mainguiwindow.h -o moc_mainguiwindow.cpp
......@@ -850,8 +855,7 @@ 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/include/QtGui/qfont.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qpen.h \
crazyFlyZone.h \
myGraphicsRectItem.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/QGraphicsRectItem \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/QGraphicsSimpleTextItem \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qgraphicsitem.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 \
......@@ -860,7 +864,8 @@ 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/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/QtWidgets/QGraphicsSimpleTextItem \
myGraphicsRectItem.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/QGraphicsRectItem \
cornergrabber.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/QObject \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/QGraphicsItem \
......@@ -876,6 +881,7 @@ 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/include/QtGui/qfontmetrics.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 \
myGraphicsScene.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 myGraphicsScene.h -o moc_myGraphicsScene.cpp
......@@ -1280,8 +1286,8 @@ main.o: main.cpp mainguiwindow.h \
myGraphicsScene.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/QGraphicsScene \
crazyFlyZone.h \
myGraphicsRectItem.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/QGraphicsSimpleTextItem \
myGraphicsRectItem.h \
cornergrabber.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/QObject \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/QGraphicsItem \
......@@ -1292,7 +1298,8 @@ main.o: main.cpp mainguiwindow.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/QColor \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/QPainter \
/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/QtCore/QPointF \
tablePiece.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o main.cpp
mainguiwindow.o: mainguiwindow.cpp mainguiwindow.h \
......@@ -1459,8 +1466,8 @@ mainguiwindow.o: mainguiwindow.cpp mainguiwindow.h \
myGraphicsScene.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/QGraphicsScene \
crazyFlyZone.h \
myGraphicsRectItem.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/QGraphicsSimpleTextItem \
myGraphicsRectItem.h \
cornergrabber.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/QObject \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/QGraphicsItem \
......@@ -1472,6 +1479,7 @@ mainguiwindow.o: mainguiwindow.cpp mainguiwindow.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/QPainter \
/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 \
/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 \
......@@ -1562,8 +1570,7 @@ myGraphicsScene.o: myGraphicsScene.cpp myGraphicsScene.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/qpen.h \
crazyFlyZone.h \
myGraphicsRectItem.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/QGraphicsRectItem \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/QGraphicsSimpleTextItem \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qgraphicsitem.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 \
......@@ -1572,7 +1579,8 @@ myGraphicsScene.o: myGraphicsScene.cpp myGraphicsScene.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/QtWidgets/QGraphicsSimpleTextItem \
myGraphicsRectItem.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/QGraphicsRectItem \
cornergrabber.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/QObject \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/QGraphicsItem \
......@@ -1588,6 +1596,7 @@ myGraphicsScene.o: myGraphicsScene.cpp myGraphicsScene.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/QPen \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/QPointF \
tablePiece.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/QRect \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/QApplication \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qapplication.h \
......@@ -1694,7 +1703,6 @@ myGraphicsRectItem.o: myGraphicsRectItem.cpp myGraphicsRectItem.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/QtWidgets/QGraphicsSimpleTextItem \
cornergrabber.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/QObject \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/QGraphicsItem \
......@@ -1956,8 +1964,112 @@ myGraphicsView.o: myGraphicsView.cpp myGraphicsView.h \
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o myGraphicsView.o myGraphicsView.cpp
crazyFlyZone.o: crazyFlyZone.cpp crazyFlyZone.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/QGraphicsSimpleTextItem \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qgraphicsitem.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/qobject.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qobjectdefs.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qnamespace.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qobjectdefs_impl.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/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/qhash.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/qiodevice.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/qshareddata.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/QtCore/qpoint.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/qsharedpointer.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/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/QtGui/qpainterpath.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/QtGui/qwindowdefs.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/qwindowdefs_win.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/qdatastream.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/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/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/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 \
myGraphicsRectItem.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/QGraphicsRectItem \
cornergrabber.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/QObject \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/QGraphicsItem \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/QGraphicsTextItem \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/QGraphicsSceneHoverEvent \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qgraphicssceneevent.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/QGraphicsSceneMouseEvent \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/QColor \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtGui/QPainter \
/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/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/QtGui/QPen \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/QPointF
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o crazyFlyZone.o crazyFlyZone.cpp
tablePiece.o: tablePiece.cpp tablePiece.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/QGraphicsSimpleTextItem \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/qgraphicsitem.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 \
......@@ -2039,7 +2151,8 @@ crazyFlyZone.o: crazyFlyZone.cpp crazyFlyZone.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/QtWidgets/QGraphicsSimpleTextItem \
myGraphicsRectItem.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/QGraphicsRectItem \
cornergrabber.h \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/QObject \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtWidgets/QGraphicsItem \
......@@ -2058,7 +2171,7 @@ crazyFlyZone.o: crazyFlyZone.cpp crazyFlyZone.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/QPen \
/home/gazebo-cf/Qt5.7.0/5.7/gcc_64/include/QtCore/QPointF
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o crazyFlyZone.o crazyFlyZone.cpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o tablePiece.o tablePiece.cpp
moc_mainguiwindow.o: moc_mainguiwindow.cpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_mainguiwindow.o moc_mainguiwindow.cpp
......
......@@ -3,6 +3,7 @@
crazyFlyZone::crazyFlyZone(const QRectF & rect, int index, QGraphicsItem * parent)
: myGraphicsRectItem(rect, parent)
{
this->setPen(QPen(Qt::black, 0));
setIndex(index);
}
......@@ -17,8 +18,6 @@ void crazyFlyZone::setLabel(QString string)
label = new QGraphicsSimpleTextItem(string, this);
label->setFlag(QGraphicsItem::ItemIgnoresTransformations);
label->setFont(QFont("Arial", 18, QFont::Bold, true));
// TODO: choose position and format of text
// label->setPos(label->mapToItem(this, QPointF(0,0)));
setLabelPosition();
}
......@@ -41,7 +40,7 @@ void crazyFlyZone::setIndex(int index)
_index = index;
}
void crazyFlyZone::rectSizeChanged()
void crazyFlyZone::rectSizeChanged() // pure virtual coming from parent
{
setLabelPosition();
}
......@@ -62,10 +62,11 @@ void MainGUIWindow::_init()
ui->graphicsView->setScene(scene);
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)));
QObject::connect(ui->tabWidget, SIGNAL(tabCloseRequested(int)), scene, SLOT(removeCrazyFlyZone(int)));
QObject::connect(scene, SIGNAL(numCrazyFlyZonesChanged(int)), this, SLOT(set_tabs(int)));
QObject::connect(ui->tabWidget, SIGNAL(currentChanged(int)), scene, SLOT(setSelectedCrazyFlyZone(int)));
QObject::connect(scene, SIGNAL(crazyFlyZoneSelected(int)), ui->tabWidget, SLOT(setCurrentIndex(int)));
QObject::connect(scene, SIGNAL(modeChanged(int)), this, SLOT(transitionToMode(int)));
}
#ifndef DEBUG_GUI
......@@ -942,3 +943,48 @@ void CSetpointQueue::print()
// }
#endif // DEBUG_GUI
void MainGUIWindow::on_drawingModeButton_clicked()
{
switch(scene->getMode())
{
case myGraphicsScene::mode_table:
{
scene->setMode(myGraphicsScene::mode_crazyfly_zones);
ui->drawingModeButton->setText("CreateCFZonesMode");
break;
}
case myGraphicsScene::mode_crazyfly_zones:
{
scene->setMode(myGraphicsScene::mode_table);
ui->drawingModeButton->setText("CreateTableMode");
break;
}
}
}
void MainGUIWindow::on_removeTable_clicked()
{
if(scene->getMode() == myGraphicsScene::mode_table)
{
scene->removeTable();
}
}
void MainGUIWindow::transitionToMode(int mode)
{
switch(mode)
{
case myGraphicsScene::mode_table:
{
ui->removeTable->setDisabled(false);
break;
}
case myGraphicsScene::mode_crazyfly_zones:
{
ui->removeTable->setDisabled(true);
break;
}
}
}
......@@ -130,12 +130,14 @@ private slots:
#endif
void set_tabs(int n);
void transitionToMode(int mode);
void on_drawingModeButton_clicked();
void on_removeTable_clicked();
private:
Ui::MainGUIWindow *ui;
myGraphicsScene* scene; //TODO: make a subclass from QGraphicScene class, mouse events
myGraphicsScene* scene;
QGraphicsRectItem* item1;
void _init();
......
......@@ -69,14 +69,40 @@
<rect>
<x>10</x>
<y>9</y>
<width>621</width>
<height>451</height>
<width>571</width>
<height>401</height>
</rect>
</property>
<property name="mouseTracking">
<bool>true</bool>
</property>
</widget>
<widget class="QPushButton" name="drawingModeButton">
<property name="geometry">
<rect>
<x>20</x>
<y>430</y>
<width>141</width>
<height>21</height>
</rect>
</property>
<property name="text">
<string>CreateTableMode</string>
</property>
</widget>
<widget class="QPushButton" name="removeTable">
<property name="geometry">
<rect>
<x>200</x>
<y>430</y>
<width>91</width>
<height>21</height>
</rect>
</property>
<property name="text">
<string>Remove Table</string>
</property>
</widget>
</widget>
<widget class="QFrame" name="frame_3">
<property name="geometry">
......
......@@ -19,8 +19,8 @@
QT_BEGIN_MOC_NAMESPACE
struct qt_meta_stringdata_MainGUIWindow_t {
QByteArrayData data[4];
char stringdata0[26];
QByteArrayData data[8];
char stringdata0[100];
};
#define QT_MOC_LITERAL(idx, ofs, len) \
Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \
......@@ -32,10 +32,16 @@ static const qt_meta_stringdata_MainGUIWindow_t qt_meta_stringdata_MainGUIWindow
QT_MOC_LITERAL(0, 0, 13), // "MainGUIWindow"
QT_MOC_LITERAL(1, 14, 8), // "set_tabs"
QT_MOC_LITERAL(2, 23, 0), // ""
QT_MOC_LITERAL(3, 24, 1) // "n"
QT_MOC_LITERAL(3, 24, 1), // "n"
QT_MOC_LITERAL(4, 26, 16), // "transitionToMode"
QT_MOC_LITERAL(5, 43, 4), // "mode"
QT_MOC_LITERAL(6, 48, 28), // "on_drawingModeButton_clicked"
QT_MOC_LITERAL(7, 77, 22) // "on_removeTable_clicked"
},
"MainGUIWindow\0set_tabs\0\0n"
"MainGUIWindow\0set_tabs\0\0n\0transitionToMode\0"
"mode\0on_drawingModeButton_clicked\0"
"on_removeTable_clicked"
};
#undef QT_MOC_LITERAL
......@@ -45,7 +51,7 @@ static const uint qt_meta_data_MainGUIWindow[] = {
7, // revision
0, // classname
0, 0, // classinfo
1, 14, // methods
4, 14, // methods
0, 0, // properties
0, 0, // enums/sets
0, 0, // constructors
......@@ -53,10 +59,16 @@ static const uint qt_meta_data_MainGUIWindow[] = {
0, // signalCount
// slots: name, argc, parameters, tag, flags
1, 1, 19, 2, 0x08 /* Private */,
1, 1, 34, 2, 0x08 /* Private */,
4, 1, 37, 2, 0x08 /* Private */,
6, 0, 40, 2, 0x08 /* Private */,
7, 0, 41, 2, 0x08 /* Private */,
// slots: parameters
QMetaType::Void, QMetaType::Int, 3,
QMetaType::Void, QMetaType::Int, 5,
QMetaType::Void,
QMetaType::Void,
0 // eod
};
......@@ -68,6 +80,9 @@ void MainGUIWindow::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _i
Q_UNUSED(_t)
switch (_id) {
case 0: _t->set_tabs((*reinterpret_cast< int(*)>(_a[1]))); break;
case 1: _t->transitionToMode((*reinterpret_cast< int(*)>(_a[1]))); break;
case 2: _t->on_drawingModeButton_clicked(); break;
case 3: _t->on_removeTable_clicked(); break;
default: ;
}
}
......@@ -98,13 +113,13 @@ int MainGUIWindow::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
if (_id < 0)
return _id;
if (_c == QMetaObject::InvokeMetaMethod) {
if (_id < 1)
if (_id < 4)
qt_static_metacall(this, _c, _id, _a);
_id -= 1;
_id -= 4;
} else if (_c == QMetaObject::RegisterMethodArgumentMetaType) {
if (_id < 1)
if (_id < 4)
*reinterpret_cast<int*>(_a[0]) = -1;
_id -= 1;
_id -= 4;
}
return _id;
}
......
......@@ -19,8 +19,8 @@
QT_BEGIN_MOC_NAMESPACE
struct qt_meta_stringdata_myGraphicsScene_t {
QByteArrayData data[8];
char stringdata0[106];
QByteArrayData data[12];
char stringdata0[158];
};
#define QT_MOC_LITERAL(idx, ofs, len) \
Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \
......@@ -30,18 +30,24 @@ 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(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"
QT_MOC_LITERAL(1, 16, 23), // "numCrazyFlyZonesChanged"
QT_MOC_LITERAL(2, 40, 0), // ""
QT_MOC_LITERAL(3, 41, 6), // "newNum"
QT_MOC_LITERAL(4, 48, 20), // "crazyFlyZoneSelected"
QT_MOC_LITERAL(5, 69, 5), // "index"
QT_MOC_LITERAL(6, 75, 11), // "modeChanged"
QT_MOC_LITERAL(7, 87, 4), // "mode"
QT_MOC_LITERAL(8, 92, 18), // "removeCrazyFlyZone"
QT_MOC_LITERAL(9, 111, 23), // "setSelectedCrazyFlyZone"
QT_MOC_LITERAL(10, 135, 12), // "changeModeTo"
QT_MOC_LITERAL(11, 148, 9) // "next_mode"
},
"myGraphicsScene\0numRectanglesChanged\0"
"\0newNum\0rectangleSelected\0index\0"
"removeRectangle\0setSelectedRectangle"
"myGraphicsScene\0numCrazyFlyZonesChanged\0"
"\0newNum\0crazyFlyZoneSelected\0index\0"
"modeChanged\0mode\0removeCrazyFlyZone\0"
"setSelectedCrazyFlyZone\0changeModeTo\0"
"next_mode"
};
#undef QT_MOC_LITERAL
......@@ -51,28 +57,32 @@ static const uint qt_meta_data_myGraphicsScene[] = {
7, // revision
0, // classname
0, 0, // classinfo
4, 14, // methods
6, 14, // methods
0, 0, // properties
0, 0, // enums/sets
0, 0, // constructors
0, // flags
2, // signalCount
3, // signalCount
// signals: name, argc, parameters, tag, flags
1, 1, 34, 2, 0x06 /* Public */,
4, 1, 37, 2, 0x06 /* Public */,
1, 1, 44, 2, 0x06 /* Public */,
4, 1, 47, 2, 0x06 /* Public */,
6, 1, 50, 2, 0x06 /* Public */,
// slots: name, argc, parameters, tag, flags
6, 1, 40, 2, 0x0a /* Public */,