AntoineH/BaxterInterface
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Ajout Readme + Modif mineures interface

Browse source
This commit is contained in:
Unknown 2018-08-10 16:57:26 +02:00
parent 1c72d90e9a
commit 3300e0efd3
100 changed files with 298 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ASIFT_tests/demo_ASIFT_src/ASIFT_matcher.cpp
View file

@ -494,7 +494,7 @@ bool ASIFT_matcher::computeCenter(int& cx, int& cy) const
* threshold : Filtering coefficient. 1-Keep 68% of the keypoints / 2-Keep 95% of the keypoints / 3-Keep 99% of the keypoints. Default : 2.
* Return true if the filtering is done.
*/
bool ASIFT_matcher::distFilter(int threshold)
bool ASIFT_matcher::distFilter(float threshold)
{
if(_showInfo)
cout<<"filtering keypoint..."<<endl;
@ -565,6 +565,11 @@ bool ASIFT_matcher::distFilter(int threshold)
_num_matchings[i]=new_match.size();
}
//Update number of remaining points
_total_num_matchings = 0;
for(unsigned int i=0; i<_num_matchings.size();i++)
_total_num_matchings+=_num_matchings[i];
//Save filtered matchs
_matchings = filtered_match;

2
ASIFT_tests/demo_ASIFT_src/ASIFT_matcher.hpp
View file

@ -55,7 +55,7 @@ public:
unsigned int match(const vector<float>& image, unsigned int w, unsigned int h, unsigned int num_tilts =1); //Perform matching between an image and the references.
bool computeROI(int& x, int& y, unsigned int& h, unsigned int& w) const; //Compute the bounding rectangle of the mathcing keypoints.
bool computeCenter(int& cx, int& cy) const; //Compute the centroid of the matching keypoints.
bool distFilter(int threshold =2); //Perform a standard deviation filtering on the matching keypoints.
bool distFilter(float threshold =2); //Perform a standard deviation filtering on the matching keypoints.
bool saveReferences(const char* ref_path) const; //Save reference data necessary for the matching.
bool loadReferences(const char* ref_path); //Load reference data necessary for the matching.

2
ASIFT_tests/demo_ASIFT_src/test_ASIFT.cpp
View file

@ -7,7 +7,7 @@ int main(int argc, char **argv)
<< " *************************** ASIFT image matching **************************** " << std::endl
<< " ******************************************************************************* " << std::endl
<< "Usage: " << argv[0] << " imgIn.png [Tilt number option] [Filter option] [Resize option] " << std::endl
<< "- imgIn.png: input image (in PNG format). " << std::endl
<< "- imgIn.png: input image. " << std::endl
<< "- [Tilt number option: 1..(32+ ?)] : 7: Recommended / 1: no tilt. " << std::endl
<< "- [Filter option: 0..3]. Standard deviation filter coeff (1-68%/2-95%/3-99%). 0: no filtering (default). " << std::endl
<< "- [Resize option: 0/1]. 1: input images resize to 800x600 (default). 0: no resize. " << std::endl