From 57c6facea1168211fb3bd0d6b7f647d39f85c407 Mon Sep 17 00:00:00 2001
From: Marek <marekraczkowksi5@gmail.com>
Date: Tue, 4 Jun 2024 16:55:27 +0200
Subject: [PATCH] added photo display next to the field

---
 source/NN/__pycache__/model.cpython-311.pyc   | Bin 2592 -> 2592 bytes
 .../neural_network.cpython-311.pyc            | Bin 5329 -> 6298 bytes
 source/NN/neural_network.py                   |  16 +++++++++++-----
 source/__pycache__/plant.cpython-311.pyc      | Bin 1960 -> 1960 bytes
 source/__pycache__/tile.cpython-311.pyc       | Bin 2715 -> 2661 bytes
 source/area/__pycache__/field.cpython-311.pyc | Bin 3622 -> 3622 bytes
 source/main.py                                |  15 +++++++++++----
 source/tile.py                                |   9 ---------
 8 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/source/NN/__pycache__/model.cpython-311.pyc b/source/NN/__pycache__/model.cpython-311.pyc
index d6663490bafe20efc0ac42990e4a6027398649a5..6623f0521d1922ee29b099e7c4c3403f72a14dcb 100644
GIT binary patch
delta 20
acmZ1=vOt7;IWI340}won3)#pm$^`&43<RwJ

delta 20
acmZ1=vOt7;IWI340}%ZA6ugmJlnVejJOx_-

diff --git a/source/NN/__pycache__/neural_network.cpython-311.pyc b/source/NN/__pycache__/neural_network.cpython-311.pyc
index 2dc9baee6444049ff46f95ba6880701a27089f08..268eb3afbc9828ea1e0fae6192b35da3b5ff0ede 100644
GIT binary patch
delta 1163
zcmZuvL2MI86rJ(z8pmGSu^l^3oP>?rh;AyiO`9M=BBZJTiBd%&PDmPBS;n(T?b?Yo
zyO97nic_I-;eeS#qn?aFPy|RtzJioH2zjF|i7fSsWQhYRCy=W4&k`Gw_V3P{{qz3(
z{qz2q>aRn-+g`65fdxNGF0A;=z9@cHK9r9TL~t%NAJR~^gVWq9VYV)Ju$t&|(RK#{
zDpG!O5J$={y226g4`l63Jk<6&SvNj{qih;~yw(LP&TKd5xDk)mbx*$KK<F-vw>BT!
z7vue(m>$we+ArbxUJ|&3=KDwx@E{2RDx?FjpM(M9Bm(#W!3m^B8<4*G7k(gOrFzr(
zSir-q;C_yWs<WOM2mZQx-}^Jhr`fPS(J3@*fmwvX{a3#u_S7-N8ZLiyRWRO*$hN{+
z*%yfx1%mgUXjLepio``*D+)!&UJ@gMpghNf>S(-ytaJ)Mb=IAQ3yZ0|R+lpQ)S^aD
za4G;$m-KWhr`5%Cxs0KTb*G-DnzlqIIOi%X>lq`nyhNwL)p_j-82y}+UXoeU3%S&V
z<lB_r!s09sI|)!if6Bot-)zghTXOG4)|6FCR!hfW(UN<%<@lByuZ;XQXv!m&JW@Ko
zBf2l2`svhF>FRk?R4h@cHDCG#WJ|Xs0mli$R&bLm_?dmD_G$nE3CwJZh{R#Ev3o*y
z&qdfn1R~yojdxqgR>gNhip6~@?+PhRH2Prk#pv`8no^(|$)pX9DE5(+jDA$1hk;gw
z#y>F8@0y@GX#&3M;==NhQ5R2ebW&}JXtXZq2Bl~CE{Sr%=p0&uP=70XGM!85I{ls}
z@R5uyvPP1IcHYn>SmZs}Z9<byQcYjU88i(vFG8OKfF^hXS4Ouzu`N$*W4sbKJp-0!
zpftV{?)v5IwX?PU(MMlx`pvP)Ppq*?vwyNSm8i{}Gs9^soGwi?o8qguOi{H&wbp#A
z>;50HL{sn&_IG=ql!uQLQvzG~L-s0g11H$E;FoxTS;6?H{94#$Q66;%*$uUC&>PoS
zewnP~v}1G?C=5gYgT+GE+jfw*WIya-==D(n_rF9fa0_^lySw0)aO@@eFWA5N7o#g2
ABme*a

delta 416
zcmbPbcu|vYIWI340}v$t3{IQQH<3?*@z6x|T)tF>EMbr^2rLkpypdC6vOF(eSdjn|
z15ip7BEi6r!oG}=fnhZeLqHxsnmh-pe3U3qo;?d}BS;6BCpKA$(UMVoatxz(y#!E%
zElUz=9776ss>B+eWlTUjfEWUzq|nsxVo@WVBAO!5!Wbo!BG|$ZC7U7yB;`_sfuwwj
z2#{1rVGL%_6nhCW(od7|7MDw6Nup2wW+A4fER6D-cd(siW;CAM!u5>NU~@KiC=;XS
z=7YR#jEn)3J@|t+s|lwv3f|%`C`wJqOfE@HiBHZ+EH0irK}3!<8fakH<jo?N7!@bC
zi7uY3CuYkSJUK^9NfjislA*{LNEI0YiC-Kxx%nxjIjMF<*+4ER42#!I-Yd3na=Q4>
I$#oJk0O4F$<NyEw

diff --git a/source/NN/neural_network.py b/source/NN/neural_network.py
index be60774..3202aa4 100644
--- a/source/NN/neural_network.py
+++ b/source/NN/neural_network.py
@@ -6,6 +6,7 @@ from torchvision.transforms import Compose, Lambda, ToTensor
 import matplotlib.pyplot as plt
 from NN.model import *
 from PIL import Image
+import pygame
 
 device = torch.device('cuda') if torch.cuda.is_available() else torch.device('cpu')
 
@@ -83,6 +84,16 @@ def load_image(image_path):
     testImage = testImage.unsqueeze(0)
     return testImage
 
+def display_image(screen, image_path, position):
+    image = pygame.image.load(image_path)
+    image = pygame.transform.scale(image, (250, 250))
+    screen.blit(image, position)
+
+def display_result(screen, position, predicted_class):
+    font = pygame.font.Font(None, 30)
+    displayed_text = font.render("The predicted image is: "+str(predicted_class), 1, (255,255,255))
+    screen.blit(displayed_text, position)
+
 def guess_image(model, image_tensor):
     with torch.no_grad():
         testOutput = model(image_tensor)
@@ -92,11 +103,6 @@ def guess_image(model, image_tensor):
 
 
 
-# image_path = 'resources/images/plant_photos/pexels-dxt-73640.jpg'
-# image_tensor = load_image(image_path)
-# prediction = guess_image(load_model(), image_tensor)
-# print(f"The predicted image is: {prediction}")
-
 #TEST - loading the image and getting results:
 # testImage_path = 'resources/images/plant_photos/1c76aa4d-11f4-47d1-8bdd-2cb78deeeccf.jpg'
 # testImage = Image.open(testImage_path)
diff --git a/source/__pycache__/plant.cpython-311.pyc b/source/__pycache__/plant.cpython-311.pyc
index 5c9ef6693b77126642fa2aa09f088b332f1cb0d9..0fab6472711cdddffc6a38e2a9dad1f953b0e091 100644
GIT binary patch
delta 19
ZcmZ3%zk;7@IWI340}xdG+sHMK9RM*C1snhX

delta 19
ZcmZ3%zk;7@IWI340}!nFy^(7kI{-2;1xo+`

diff --git a/source/__pycache__/tile.cpython-311.pyc b/source/__pycache__/tile.cpython-311.pyc
index 1777104e083e4ec45bc5c3fcc51180d8f36bcf60..25b2aa6556213f3034d7cf02f6852ebc22aa7c03 100644
GIT binary patch
delta 249
zcmbO&`c#B>IWI340}$+&jZfRMkvEx*kzsNnTj1muZ1R)uvvE!qV3%iPn{2=?$;%H?
z1_4<dlf&56899OC5|gK~3yE<RDF9`Pn1RGCmi&U$yj#o#IVF=1vzIbPPPXKbpPbAw
zgVAX6AC5{bc2<!O446a_FUSB^Afd@q1hT3~ck+Br4=HmH6D-FKWc}i>$<0qG%}KQ@
ZvYpJxm1=6l2s90o_y`jFf<*#s6aeH2I3)l8

delta 289
zcmaDVGFy~)IWI340}zD&4Ng0-kvEx*QEhS|TOivqpxA1L$qww|jI5J)v8gk%O@73t
zuFeip3jz>%2%CX{k)cEo#%5s1;+$;2uFl9cIf7kFn!88=C{x4?ByO?f7o_IhVlK!j
zxy78BpEr31dnseeWIhggcJ@xr9?lNV$(kH<7>y?%<EYf)U={hmfJqebf=put5}G_k
z{2;d8<V;QvDGLx2EXNIG{o=66%}*)KNwq7on|zux)zp{~Xc{K*5hV5niv-vx0AlDp
A`v3p{

diff --git a/source/area/__pycache__/field.cpython-311.pyc b/source/area/__pycache__/field.cpython-311.pyc
index b01eaf35f5961ad65f98e7dbc75accd1210643a9..df05e7f75cfd97bc0c9ddb0db0b189161c1cc71c 100644
GIT binary patch
delta 19
ZcmZ1`vrL9-IWI340}xdG+sGxu2LLgM1h)VH

delta 19
ZcmZ1`vrL9-IWI340}#yLy^%|X4*)S21epK;

diff --git a/source/main.py b/source/main.py
index 7d5461f..cf13d41 100644
--- a/source/main.py
+++ b/source/main.py
@@ -12,10 +12,12 @@ from ground import Dirt
 from plant import Plant
 from bfs import graphsearch, Istate, succ
 from astar import a_star
-from NN.neural_network import load_model, load_image, guess_image
+from NN.neural_network import load_model, load_image, guess_image, display_image, display_result
 from PIL import  Image
 
-WIN = pygame.display.set_mode((WIDTH, HEIGHT))
+pygame.init()
+WIN_WIDTH = WIDTH + 300
+WIN = pygame.display.set_mode((WIN_WIDTH, HEIGHT))
 pygame.display.set_caption('Intelligent tractor')
 
 
@@ -76,10 +78,15 @@ def main():
 
         #guessing the image under the tile:
         goalTile = tiles[tile_index]
-        goalTile.display_photo()
         image_path = goalTile.photo
+        display_image(WIN, goalTile.photo, (WIDTH-20 , 300))   #displays photo next to the field
+        pygame.display.update()
+
         image_tensor = load_image(image_path)
         prediction = guess_image(load_model(), image_tensor)
+        
+        display_result(WIN, (WIDTH - 50 , 600), prediction)      #display text under the photo
+        pygame.display.update()
         print(f"The predicted image is: {prediction}")
 
 
@@ -144,7 +151,7 @@ def main():
         #work on field:
         if predykcje == 'work':
             tractor.work_on_field(goalTile, d1, p1)
-        time.sleep(30)
+        time.sleep(50)
         print("\n")
 
 
diff --git a/source/tile.py b/source/tile.py
index 40ccc34..96ab9c8 100644
--- a/source/tile.py
+++ b/source/tile.py
@@ -52,12 +52,3 @@ class Tile:
             self.image = "resources/images/rock_dirt.png"
 
 
-    def display_photo(self):
-        image_path = self.photo
-        img = Image.open(image_path)
-        plt.ion()
-        plt.imshow(img)
-        plt.axis('off')
-        plt.show()
-        time.sleep(5)
-        plt.close()