apoorva/greenhouse
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed wrong GUI timing

Browse Source 
Updated version to 0.1.1

git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@19 620bd6b2-0a58-f614-fd9a-1bd335dccda9
This commit is contained in:
matlabbe 2011-11-10 14:29:38 +00:00
parent f2f1ab037a
commit d71dcd00ea
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -9,7 +9,7 @@ ADD_DEFINITIONS(-DPROJECT_NAME="${PROJECT_NAME}")
####################### #######################
# VERSION # VERSION
####################### #######################
SET(PROJECT_VERSION "0.1.0") SET(PROJECT_VERSION "0.1.1")
STRING(REGEX MATCHALL "[0-9]" PROJECT_VERSION_PARTS "${PROJECT_VERSION}") STRING(REGEX MATCHALL "[0-9]" PROJECT_VERSION_PARTS "${PROJECT_VERSION}")

10
src/MainWindow.cpp
View File

@ -318,9 +318,9 @@ void MainWindow::update()
detector->detect(img, keypoints); detector->detect(img, keypoints);
delete detector; delete detector;
ui_->label_timeDetection->setText(QString::number(time.elapsed())); ui_->label_timeDetection->setText(QString::number(time.elapsed()));
time.start();
// EXTRACT DESCRIPTORS // EXTRACT DESCRIPTORS
time.start();
cv::Mat descriptors; cv::Mat descriptors;
cv::DescriptorExtractor * extractor = Settings::createDescriptorsExtractor(); cv::DescriptorExtractor * extractor = Settings::createDescriptorsExtractor();
extractor->compute(img, keypoints, descriptors); extractor->compute(img, keypoints, descriptors);
@ -334,30 +334,30 @@ void MainWindow::update()
cvReleaseImage(&imageGrayScale); cvReleaseImage(&imageGrayScale);
} }
ui_->label_timeExtraction->setText(QString::number(time.elapsed())); ui_->label_timeExtraction->setText(QString::number(time.elapsed()));
time.start();
// COMPARE // COMPARE
int alpha = 20*255/100; int alpha = 20*255/100;
if(!dataTree_.empty()) if(!dataTree_.empty())
{ {
// CREATE INDEX // CREATE INDEX
time.start();
cv::Mat environment(descriptors.rows, descriptors.cols, CV_32F); cv::Mat environment(descriptors.rows, descriptors.cols, CV_32F);
descriptors.convertTo(environment, CV_32F); descriptors.convertTo(environment, CV_32F);
cv::flann::Index treeFlannIndex(environment, cv::flann::KDTreeIndexParams()); cv::flann::Index treeFlannIndex(environment, cv::flann::KDTreeIndexParams());
ui_->label_timeIndexing->setText(QString::number(time.elapsed())); ui_->label_timeIndexing->setText(QString::number(time.elapsed()));
time.start();
// DO NEAREST NEIGHBOR // DO NEAREST NEIGHBOR
time.start();
int k = 2; int k = 2;
int emax = 64; int emax = 64;
cv::Mat results(dataTree_.rows, k, CV_32SC1); // results index cv::Mat results(dataTree_.rows, k, CV_32SC1); // results index
cv::Mat dists(dataTree_.rows, k, CV_32FC1); // Distance results are CV_32FC1 cv::Mat dists(dataTree_.rows, k, CV_32FC1); // Distance results are CV_32FC1
treeFlannIndex.knnSearch(dataTree_, results, dists, k, cv::flann::SearchParams(emax) ); // maximum number of leafs checked treeFlannIndex.knnSearch(dataTree_, results, dists, k, cv::flann::SearchParams(emax) ); // maximum number of leafs checked
ui_->label_timeMatching->setText(QString::number(time.elapsed())); ui_->label_timeMatching->setText(QString::number(time.elapsed()));
time.start();
// PROCESS RESULTS // PROCESS RESULTS
time.start();
ui_->imageView_source->setData(keypoints, cv::Mat(), cvImage); ui_->imageView_source->setData(keypoints, cv::Mat(), cvImage);
int j=0; int j=0;
std::vector<cv::Point2f> mpts_1, mpts_2; std::vector<cv::Point2f> mpts_1, mpts_2;
@ -474,7 +474,7 @@ void MainWindow::update()
} }
} }
ui_->label_detectorDescriptorType->setText(QString("%1/%2").arg(Settings::currentDetectorType()).arg(Settings::currentDescriptorType())); ui_->label_detectorDescriptorType->setText(QString("%1/%2").arg(Settings::currentDetectorType()).arg(Settings::currentDescriptorType()));
ui_->label_timeRefreshRate->setText(QString("(%1 Hz - %2 Hz)").arg(QString::number(1000/cameraTimer_.interval())).arg(QString::number(int(1000.0f/(float)(updateRate_.elapsed()))))); ui_->label_timeRefreshRate->setText(QString("(%1 Hz - %2 Hz)").arg(QString::number(1000/cameraTimer_.interval())).arg(QString::number(int(1000.0f/(float)(updateRate_.elapsed()) + 1))));
//printf("GUI refresh rate %f Hz\n", 1000.0f/(float)(updateRate_.elapsed())); //printf("GUI refresh rate %f Hz\n", 1000.0f/(float)(updateRate_.elapsed()));
updateRate_.start(); updateRate_.start();
} }