Permalink
Browse files

[mmm_orsa_homography] update with current version of code

  • Loading branch information...
pmonasse committed Mar 30, 2012
1 parent a666b4a commit 05f75fa77c9a40f115ab0b7b75bec8ac7604c4a2
@@ -1,5 +1,6 @@
"""
-ORSA Homography
+Automatic homographic registration of a pair of images, with a contrario
+elimination of outliers
"""
from .app import app
@@ -23,7 +23,8 @@ class NoMatchError(RuntimeError):
class app(base_app):
""" template demo app """
- title = "Image registration with a contrario RANSAC variant"
+ title = """Automatic homographic registration of a pair of images,
+with a contrario elimination of outliers"""
input_nb = 2 # number of input images
input_max_pixels = 1600 * 1200 # max size (in pixels) of an input image
@@ -50,9 +51,9 @@ def build(self):
# store common file path in variables
tgz_file = self.dl_dir + "OrsaHomography.tar.gz"
tgz_url = "http://www.ipol.im/pub/algo/mmm_orsa_homography/" + \
- "OrsaHomography_20120323.tar.gz"
+ "OrsaHomography_20120330.tar.gz"
build_dir = (self.src_dir
- + os.path.join("OrsaHomography_20120323", "build")
+ + os.path.join("OrsaHomography_20120330", "build")
+ os.path.sep)
exe = build_dir + os.path.join("demo","demo_orsa_homography")
prog = self.bin_dir + "demo_orsa_homography"
@@ -11,7 +11,7 @@
</select><br \>
Choose the SIFT ratio (higher=more matches).
<select name="SiftRatio">
- %for _p in ['0.6','0.8','1']:
+ %for _p in ['0.6','0.8','1','1.1']:
<option value="${_p}">${_p}</option>
%endfor
</select><br />
@@ -57,17 +57,17 @@ <h2>Input Images</h2>
<ul class="index">
<li>
<a href="#">
- first image
+ second image
<span>
- <img src="${app.work_url + 'input_0.png'}" />
+ <img src="${app.work_url + 'input_1.png'}" />
</span>
</a>
</li>
<li>
<a href="#">
- second image
+ first image
<span>
- <img src="${app.work_url + 'input_1.png'}" />
+ <img src="${app.work_url + 'input_0.png'}" />
</span>
</a>
</li>
@@ -1,10 +1,26 @@
<%include file="header.html" />
<p>
- The algorithm did not find a valid registration model.
+ The algorithm ran in ${"%0.2f" % app.cfg['info']['run_time']}s but did not find a valid registration model.
See below for a possible explanation.
</p>
+<form action="${app.base_url}" method="get">
+ <div class="action">
+ Restart with new input.
+ <input type="submit" value="new input" />
+ </div>
+</form>
+
+<form action="${app.base_url + 'params'}" method="get">
+ <div class="action">
+ Restart with new parameters.
+ <input type="hidden" name="key" value="${app.key}" />
+ <input type="hidden" name="newrun" value="1" />
+ <input type="submit" value="new parameters" />
+ </div>
+</form>
+
<h2>Results</h2>
<div class="gallery" style="height: ${height}px;">

0 comments on commit 05f75fa

Please sign in to comment.