From 2e8147d491992645896d19f2d35f9b722c4eabd7 Mon Sep 17 00:00:00 2001
From: dhaviesayo <105015828+dhaviesayo@users.noreply.github.com>
Date: Fri, 5 Jul 2024 23:33:58 +0100
Subject: [PATCH] Update sift-keypoint.py

---
 src/sift-keypoint.py | 112 +++++++++++++++----------------------------
 1 file changed, 39 insertions(+), 73 deletions(-)

diff --git a/src/sift-keypoint.py b/src/sift-keypoint.py
index 86d60b0..c259c33 100644
--- a/src/sift-keypoint.py
+++ b/src/sift-keypoint.py
@@ -1,77 +1,43 @@
 import cv2
 import numpy as np
 import matplotlib.pyplot as plt
-
-
-
-train_img = cv2.imread('../res/train.jpg')
-
-query_img = cv2.imread('../res/query.jpg')
-
-
-# Show Images 
-plt.figure(1)
-plt.imshow(cv2.cvtColor(train_img, cv2.CV_32S))
-plt.title('Train Image')
-
-plt.figure(2)
-plt.imshow(cv2.cvtColor(query_img, cv2.CV_32S))
-plt.title('Query Image')
-
-
-
-# Turn Images to grayscale
-
-def to_gray(color_img):
-    gray = cv2.cvtColor(color_img, cv2.COLOR_BGR2GRAY)
-    return gray
-
-train_img_gray = to_gray(train_img)
-query_img_gray = to_gray(query_img)
-
-plt.figure(3)
-plt.imshow(train_img_gray, cmap='gray')
-plt.title('Train Image -Gray')
-
-
-plt.figure(4)
-plt.imshow(query_img_gray, cmap= 'gray')
-plt.title('Query Image -Gray')
-
-
-# Initialise SIFT detector
-sift = cv2.xfeatures2d.SIFT_create()
+import torch
+
+class sift_keypoint(torch.nn.modules.Module):
+    def __init__(self ,  train_img ,  query_img):
+        super(sift_keypoint , self).__init__()
+        
+        def to_gray(color_img):
+            gray = cv2.cvtColor(color_img, cv2.COLOR_BGR2GRAY)
+            return gray
+
+        self.train= train_img
+        self.query= query_img
+
+    def forward(self ,  draw_n_matches):
+        # Initialise SIFT detector
+        sift = cv2.xfeatures2d.SIFT_create()
+        train_img_gray = to_gray(self.train)
+        query_img_gray = to_gray(self.query)
     
-# Generate SIFT keypoints and descriptors
-train_kp, train_desc = sift.detectAndCompute(train_img_gray, None)
-query_kp, query_desc = sift.detectAndCompute(query_img_gray, None)
-
-plt.figure(5)
-plt.imshow((cv2.drawKeypoints(train_img_gray, train_kp, train_img.copy())))
-plt.title('Train Image Keypoints')
-
-plt.figure(6)
-plt.imshow((cv2.drawKeypoints(query_img_gray, query_kp, query_img.copy())))
-plt.title('Query Image Keypoints')
-
-
-# create a BFMatcher object which will match up the SIFT features
-bf = cv2.BFMatcher(cv2.NORM_L2, crossCheck=True)
-
-matches = bf.match(train_desc, query_desc)
-
-# Sort the matches in the order of their distance.
-matches = sorted(matches, key = lambda x:x.distance)
-
-# draw the top N matches
-N_MATCHES = 100
-
-match_img = cv2.drawMatches(
-    train_img, train_kp,
-    query_img, query_kp,
-    matches[:N_MATCHES], query_img.copy(), flags=0)
-
-plt.figure(7)
-plt.imshow(match_img)
-plt.title('SIFT Detection')
-plt.show()
\ No newline at end of file
+        # Generate SIFT keypoints and descriptors
+        train_kp, train_desc = sift.detectAndCompute(train_img_gray, None)
+        query_kp, query_desc = sift.detectAndCompute(query_img_gray, None)
+
+        # create a BFMatcher object which will match up the SIFT features
+        bf = cv2.BFMatcher(cv2.NORM_L2, crossCheck=True)
+        
+        matches = bf.match(train_desc, query_desc)
+
+        # Sort the matches in the order of their distance.
+        matches = sorted(matches, key = lambda x:x.distance)
+
+        # draw the top N matches
+        N_MATCHES = draw_n_matches
+
+        match_img = cv2.drawMatches(
+            train_img, train_kp,
+            query_img, query_kp,
+            matches[:N_MATCHES], query_img.copy(), flags=0)
+        
+        return match_img