diff --git a/.gitignore b/.gitignore index 25404098b01744b9593e9db7e2c7a09f58660573..3e48c01046f5b4f78cd38d12e31b5c5d5cf6a15b 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ doc/html doc/doxy.log deploy/mac deploy/linux +controller_log* diff --git a/src/ui/ObjectDetectionView.cc b/src/ui/ObjectDetectionView.cc index 4439591d405e78d61091893f76df000cf305d97a..68e9f3c2e08141079c36c08602cbad5ab08fcc44 100644 --- a/src/ui/ObjectDetectionView.cc +++ b/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() diff --git a/waypoints_A0_circlev6.txt b/waypoints_A0_circlev6.txt new file mode 100644 index 0000000000000000000000000000000000000000..b53d1971a002800a318a2527695691c9b32dbcc2 --- /dev/null +++ b/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 diff --git a/waypoints_A0_circlev7.txt b/waypoints_A0_circlev7.txt new file mode 100644 index 0000000000000000000000000000000000000000..fec392491e874dc683e581419d4c2df202bcba38 --- /dev/null +++ b/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 diff --git a/waypoints_A0_circlev8.txt b/waypoints_A0_circlev8.txt new file mode 100644 index 0000000000000000000000000000000000000000..9b79c7fbf22fa6025207b488bde3ea68fa213ba1 --- /dev/null +++ b/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