From 3ba8c95284d947d6dbbb459d8dc70970d288bcf7 Mon Sep 17 00:00:00 2001
From: matlabbe <matlabbe@620bd6b2-0a58-f614-fd9a-1bd335dccda9>
Date: Tue, 28 Aug 2012 20:34:00 +0000
Subject: [PATCH] Minor changes... added some debug info

git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@111 620bd6b2-0a58-f614-fd9a-1bd335dccda9
---
 src/MainWindow.cpp   |   5 ++
 src/ui/mainWindow.ui | 128 ++++++++++++++++++++++++-------------------
 2 files changed, 76 insertions(+), 57 deletions(-)

diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index 57a10080..bb9e8b40 100644
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -541,6 +541,8 @@ void MainWindow::updateObjects()
 	{
 		for(int i=0; i<objects_.size(); ++i)
 		{
+			QTime time;
+			time.start();
 			const cv::Mat & img = objects_.at(i)->cvImage();
 			cv::FeatureDetector * detector = Settings::createFeaturesDetector();
 			std::vector<cv::KeyPoint> keypoints;
@@ -562,6 +564,7 @@ void MainWindow::updateObjects()
 			{
 				printf("WARNING: no features detected in object %d !?!\n", objects_.at(i)->id());
 			}
+			printf("%d descriptors extracted from object %d (in %d ms)\n", descriptors.rows, objects_.at(i)->id(), time.elapsed());
 			objects_.at(i)->setData(keypoints, descriptors, img, Settings::currentDetectorType(), Settings::currentDescriptorType());
 
 			//update object labels
@@ -658,6 +661,7 @@ void MainWindow::updateData()
 			flannIndex_.build(objectsDescriptors_, *params, Settings::getFlannDistanceType());
 			delete params;
 			ui_->label_timeIndexing->setNum(time.restart());
+			ui_->label_vocabularySize->setNum(objectsDescriptors_.rows);
 		}
 	}
 }
@@ -839,6 +843,7 @@ void MainWindow::update(const cv::Mat & image)
 				flannIndex_.build(descriptors, *params, Settings::getFlannDistanceType());
 				delete params;
 				ui_->label_timeIndexing->setNum(time.restart());
+				ui_->label_vocabularySize->setNum(objectsDescriptors_.rows);
 			}
 
 			// DO NEAREST NEIGHBOR
diff --git a/src/ui/mainWindow.ui b/src/ui/mainWindow.ui
index 09ca75c2..d2544cd0 100644
--- a/src/ui/mainWindow.ui
+++ b/src/ui/mainWindow.ui
@@ -292,6 +292,62 @@
           <property name="verticalSpacing">
            <number>0</number>
           </property>
+          <item row="4" column="1">
+           <widget class="QLabel" name="label_timeMatching">
+            <property name="text">
+             <string>000</string>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="2">
+           <widget class="QLabel" name="label_9">
+            <property name="text">
+             <string>ms</string>
+            </property>
+           </widget>
+          </item>
+          <item row="4" column="2">
+           <widget class="QLabel" name="label_10">
+            <property name="text">
+             <string>ms</string>
+            </property>
+           </widget>
+          </item>
+          <item row="5" column="2">
+           <widget class="QLabel" name="label_12">
+            <property name="text">
+             <string>ms</string>
+            </property>
+           </widget>
+          </item>
+          <item row="6" column="1">
+           <widget class="QLabel" name="label_minMatchedDistance">
+            <property name="text">
+             <string>000</string>
+            </property>
+           </widget>
+          </item>
+          <item row="6" column="0">
+           <widget class="QLabel" name="label_13">
+            <property name="text">
+             <string>Min matched distance</string>
+            </property>
+           </widget>
+          </item>
+          <item row="7" column="0">
+           <widget class="QLabel" name="label_14">
+            <property name="text">
+             <string>Max matched distance</string>
+            </property>
+           </widget>
+          </item>
+          <item row="7" column="1">
+           <widget class="QLabel" name="label_maxMatchedDistance">
+            <property name="text">
+             <string>000</string>
+            </property>
+           </widget>
+          </item>
           <item row="5" column="0">
            <widget class="QLabel" name="label_11">
             <property name="text">
@@ -369,62 +425,6 @@
             </property>
            </widget>
           </item>
-          <item row="4" column="1">
-           <widget class="QLabel" name="label_timeMatching">
-            <property name="text">
-             <string>000</string>
-            </property>
-           </widget>
-          </item>
-          <item row="3" column="2">
-           <widget class="QLabel" name="label_9">
-            <property name="text">
-             <string>ms</string>
-            </property>
-           </widget>
-          </item>
-          <item row="4" column="2">
-           <widget class="QLabel" name="label_10">
-            <property name="text">
-             <string>ms</string>
-            </property>
-           </widget>
-          </item>
-          <item row="5" column="2">
-           <widget class="QLabel" name="label_12">
-            <property name="text">
-             <string>ms</string>
-            </property>
-           </widget>
-          </item>
-          <item row="6" column="1">
-           <widget class="QLabel" name="label_minMatchedDistance">
-            <property name="text">
-             <string>000</string>
-            </property>
-           </widget>
-          </item>
-          <item row="6" column="0">
-           <widget class="QLabel" name="label_13">
-            <property name="text">
-             <string>Min matched distance</string>
-            </property>
-           </widget>
-          </item>
-          <item row="7" column="0">
-           <widget class="QLabel" name="label_14">
-            <property name="text">
-             <string>Max matched distance</string>
-            </property>
-           </widget>
-          </item>
-          <item row="7" column="1">
-           <widget class="QLabel" name="label_maxMatchedDistance">
-            <property name="text">
-             <string>000</string>
-            </property>
-           </widget>
-          </item>
           <item row="0" column="0">
            <widget class="QLabel" name="label_6">
             <property name="text">
@@ -446,6 +446,20 @@
             </property>
            </widget>
           </item>
+          <item row="8" column="0">
+           <widget class="QLabel" name="label_17">
+            <property name="text">
+             <string>Vocabulary size</string>
+            </property>
+           </widget>
+          </item>
+          <item row="8" column="1">
+           <widget class="QLabel" name="label_vocabularySize">
+            <property name="text">
+             <string>000</string>
+            </property>
+           </widget>
+          </item>
          </layout>
         </item>
        </layout>
@@ -462,7 +476,7 @@
           <x>0</x>
           <y>0</y>
           <width>348</width>
-          <height>373</height>
+          <height>357</height>
          </rect>
         </property>
         <attribute name="label">