Merge branch 'master' of git@pixhawk.ethz.ch:qgroundcontrol

.gitignore

@@ -23,3 +23,4 @@ doc/html
 doc/doxy.log
 deploy/mac
 deploy/linux
+controller_log*

src/ui/ObjectDetectionView.cc

@@ -188,8 +188,13 @@ void ObjectDetectionView::clearLists()
 {
     patternList.clear();
     letterList.clear();
+
     m_ui->listWidget->clear();
     m_ui->letterListWidget->clear();
+
+    m_ui->imageLabel->clear();;
+    m_ui->letterLabel->clear();
+    m_ui->nameLabel->clear();
 }
 
 void ObjectDetectionView::takeAction()

waypoints_A0_circlev6.txt

@@ -0,0 +1,10 @@
+	0	1.70917	0.479173	-0.7	0.0166169	1	0	0.2	0
+	1	1.06535	0.685009	-0.7	0	1	0	0.2	0
+	2	0.549035	1.49192	-0.7	0	1	0	0.2	0
+	3	0.686046	2.54501	-0.7	-0.00386592	1	0	0.2	0
+	4	1.66	2.89715	-0.7	0	1	0	0.2	0
+	5	2.43282	2.89177	-0.7	0	1	0	0.2	0
+	6	2.73	1.83	-0.7	0	1	1	0.3	0
+	7	2.72167	1.07	-0.7	0	1	0	0.2	0
+	8	2.01283	0.620645	-0.7	0	1	0	0.2	0
+	9	1.7569	0.651101	0	0	1	0	0.2	2000

waypoints_A0_circlev7.txt

@@ -0,0 +1,10 @@
+	0	1.70917	0.479173	-0.7	1.5708	1	1	0.2	5000
+	1	1.06535	0.685009	-0.7	1.5708	1	0	0.2	0
+	2	0.549035	1.49192	-0.7	1.5708	1	0	0.2	0
+	3	0.686046	2.54501	-0.7	1.5708	1	0	0.2	0
+	4	1.66	2.85	-0.7	1.5708	1	0	0.2	0
+	5	2.43282	2.74	-0.7	1.5708	1	0	0.2	0
+	6	2.73	1.53	-0.7	1.5708	1	0	0.2	0
+	7	2.72167	1.07	-0.7	1.5708	1	0	0.2	0
+	8	2.01283	0.620645	-0.7	1.5708	1	0	0.2	0
+	9	1.7569	0.651101	0	1.5708	0	0	0.2	2000

waypoints_A0_circlev8.txt

@@ -0,0 +1,10 @@
+	0	1.70917	0.479173	-0.7	1.5708	1	0	0.2	5000
+	1	1.06535	0.685009	-0.7	1.5708	1	0	0.2	0
+	2	0.549035	1.49192	-0.7	1.5708	1	0	0.2	0
+	3	0.686046	2.54501	-0.7	1.5708	1	0	0.2	0
+	4	1.66	2.85	-0.7	1.5708	1	0	0.2	0
+	5	2.43282	2.74	-0.7	1.5708	1	0	0.2	0
+	6	2.73	1.58	-0.7	1.5708	1	0	0.3	0
+	7	2.72167	1.07	-0.7	1.5708	1	0	0.2	0
+	8	2.01283	0.620645	-0.7	1.5708	1	0	0.2	0
+	9	1.7569	0.651101	0	1.5708	0	1	0.2	2000