From 6ac50b69f2f75efb706a76e9a69f1448d7570bad Mon Sep 17 00:00:00 2001
From: Marc Aubreville <marc.aubreville@hs-flensburg.de>
Date: Fri, 28 Jun 2024 15:47:08 +0200
Subject: [PATCH] Added all registration parameters to (collapsed) UI element.

---
 .../images/templates/images/imageset_v2.html  | 82 +++++++++++++++++++
 exact/exact/images/views.py                   | 15 +++-
 2 files changed, 96 insertions(+), 1 deletion(-)

diff --git a/exact/exact/images/templates/images/imageset_v2.html b/exact/exact/images/templates/images/imageset_v2.html
index 98ad87dd..687b9bd3 100644
--- a/exact/exact/images/templates/images/imageset_v2.html
+++ b/exact/exact/images/templates/images/imageset_v2.html
@@ -379,6 +379,88 @@ <h3>{{imageset.name}} : Registration
                 </table>
                 <div>
                 <input class="btn btn-primary" type="submit" value="Register">
+                <button class="btn btn-secondary" type="button" data-toggle="collapse" data-target="#collapseOptions" aria-expanded="false" aria-controls="collapseOptions">
+                    Options &#9660;
+                  </button>
+                
+                <div class="collapse" id="collapseOptions">
+                    <div class="card card-body">
+                      <table><tr><td>
+                      maxFeatures:
+                    </td><td><select name="maxFeatures">
+                        <option value=256>256</option>
+                        <option value=512>512</option>
+                        <option value=1024 selected>1024</option>
+                        <option value=2048>2048</option>
+                        <option value=4096>4096</option>
+                    </select>
+                </td></tr>
+                <tr><td>thumbnail_size</td>
+                <td>
+                    <select name="thumbnail_size_1">
+                        <option value=512>512</option>
+                        <option value=1024 selected>1024</option>
+                        <option value=2048>2048</option>
+                        <option value=4096>4096</option>
+                        <option value=8192>8192</option>
+                    </select>  x 
+                    <select name="thumbnail_size_2">
+                        <option value=512>512</option>
+                        <option value=1024 selected>1024</option>
+                        <option value=2048>2048</option>
+                        <option value=4096>4096</option>
+                        <option value=8192>8192</option>
+                    </select>
+                </td></tr>
+                <tr><td>
+                    filter outliers:
+                  </td><td><select name="filter_outliner">
+                      <option value=0 selected>no</option>
+                      <option value=1>yes</option>
+                  </select>
+              </td></tr>                
+              <tr><td>
+                use_gray:
+              </td><td><select name="use_gray">
+                  <option value=0 selected>no</option>
+                  <option value=1>yes</option>
+              </select>
+          </td></tr>                
+          <tr><td>
+                target_depth:
+              </td><td><select name="target_depth">
+                  <option value=1>1</option>
+                  <option value=2>2</option>
+                  <option value=3>3</option>
+                  <option value=4 selected>4</option>
+                  <option value=5>5</option>
+                  <option value=6>6</option>
+                  <option value=7>7</option>
+                  <option value=8>8</option>
+              </select>
+          </td></tr>     
+          <tr><td>
+            point_extractor
+          </td><td>
+            <select name="point_extractor">
+                <option selected value="sift">SIFT</option>
+                <option value="orb">ORB</option>
+            </select>
+          </td></tr>           
+          <tr><td>
+            feature matching
+          </td><td>
+            <select name="flann">
+                <option selected value=1>FLANN</option>
+                <option value=0>brute force</option>
+            </select>
+          </td></tr>
+          <tr><td>scale</td>
+        <td><input type=text value='0.7' name="scale"></td></tr>           
+
+            </table>
+            </div>
+                </div>
                 </div>
 
                 <div class="row" style="padding-top: 20px;">
diff --git a/exact/exact/images/views.py b/exact/exact/images/views.py
index 4e8e2e0b..276c658c 100644
--- a/exact/exact/images/views.py
+++ b/exact/exact/images/views.py
@@ -727,12 +727,25 @@ def view_imageset(request, image_set_id):
 
         image_registration = ImageRegistration.objects.filter(source_image=source_image, target_image=target_image).first()        
 
+        maxFeatures=int(request.POST['maxFeatures'])
+        thumbnail_size=(int(request.POST['thumbnail_size_1']),int(request.POST['thumbnail_size_2']))
+        filter_outliner=int(request.POST['filter_outliner'])
+        maxFeatures=int(request.POST['maxFeatures'])
+        use_gray=int(request.POST['use_gray'])
+        target_depth=int(request.POST['target_depth'])
+        point_extractor='orb' if (request.POST['point_extractor'] == 'orb') else 'sift'
+        flann=1 if (request.POST['flann']=='1') else 0
+        scale=float(request.POST['scale'])
+
+
         # register the two images
         if image_registration is None:
 
             image_registration = ImageRegistration(source_image=source_image, target_image=target_image)        
         
-        image_registration.perform_registration() # use default parameters for now
+        image_registration.perform_registration(maxFeatures=maxFeatures, thumbnail_size=thumbnail_size, filter_outliner=filter_outliner,
+                                                use_gray=use_gray, target_depth=target_depth, point_extractor=point_extractor, flann=flann,
+                                                scale=scale) # use default parameters for now
 
     image_registration_src = ImageRegistration.objects.filter(source_image_id__in=imageset.images.all())       
     image_registration_trg = ImageRegistration.objects.filter(target_image_id__in=imageset.images.all())