Compare commits

...

2 Commits

Author SHA1 Message Date
549aba963a
add splitting system (3x3) if nothing found 2024-07-17 22:24:32 +02:00
1aa018f7d5
improved webui 2024-07-17 22:02:50 +02:00
5 changed files with 94 additions and 40 deletions

View File

@ -2,6 +2,7 @@ import json
import os
import sys
import threading
import time
from time import sleep
import ultimateAlprSdk
@ -126,6 +127,7 @@ def create_rest_server_flask():
def alpr(domain, module):
# Only care about the ALPR endpoint
if domain == 'image' and module == 'alpr':
interference = time.time()
if 'upload' not in request.files:
return jsonify({'error': 'No image found'})
@ -134,9 +136,65 @@ def create_rest_server_flask():
return jsonify({'error': 'No selected file'})
image = Image.open(image)
result = process_image(image)
result = convert_to_cpai_compatible(result)
result = convert_to_cpai_compatible(process_image(image))
if len(result['predictions']) == 0:
print("No plate found in the image, trying to split the image")
predictions_found = []
width, height = image.size
cell_width = width // 3
cell_height = height // 3
# Define which cells to process (2, 4, 5, 6, 8, 9)
cells_to_process = [2, 4, 5, 6, 8, 9]
# Loop through each cell
for cell_index in range(1, 10):
# Calculate row and column of the cell
row = (cell_index - 1) // 3
col = (cell_index - 1) % 3
# Calculate bounding box of the cell
left = col * cell_width
upper = row * cell_height
right = left + cell_width
lower = upper + cell_height
# Check if this cell should be processed
if cell_index in cells_to_process:
# Extract the cell as a new image
cell_image = image.crop((left, upper, right, lower))
result_cell = json.loads(process_image(cell_image))
if 'plates' in result_cell:
for plate in result_cell['plates']:
warpedBox = plate['warpedBox']
x_coords = warpedBox[0::2]
y_coords = warpedBox[1::2]
x_min = min(x_coords) + left
x_max = max(x_coords) + left
y_min = min(y_coords) + upper
y_max = max(y_coords) + upper
predictions_found.append({
'confidence': plate['confidences'][0] / 100,
'label': "Plate: " + plate['text'],
'plate': plate['text'],
'x_min': x_min,
'x_max': x_max,
'y_min': y_min,
'y_max': y_max
})
if len(predictions_found) > 0:
# add the prediction with the highest confidence
result['predictions'].append(max(predictions_found, key=lambda x: x['confidence']))
result['processMs'] = round((time.time() - interference) * 1000, 2)
result['inferenceMs'] = result['processMs'] # same as processMs
return jsonify(result)
else:
return jsonify({'error': 'Endpoint not implemented'}), 404

View File

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

BIN
static/logo_white.webp Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

View File

@ -1,25 +0,0 @@
body {
font-family: 'Arial', sans-serif;
background-color: #f4f4f9;
margin: 0;
padding: 0;
}
.container {
background: #fff;
padding: 20px;
border-radius: 10px;
box-shadow: 0 0 20px rgba(0, 0, 0, 0.1);
max-width: 600px;
margin: auto;
}
h1, h2 {
color: #333;
}
pre {
background-color: #f8f9fa;
border: 1px solid #ddd;
border-radius: 5px;
}

View File

@ -5,44 +5,45 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Image Upload</title>
<script src="https://cdn.tailwindcss.com"></script>
<link rel="stylesheet" href="{{ url_for('static', filename='styles.css') }}">
<!-- Include Google Sans font -->
<link href="https://fonts.googleapis.com/css2?family=Google+Sans:wght@400;500;700&display=swap" rel="stylesheet">
<style>
body {
background-color: #f0f2f5;
background-image: radial-gradient(#ffffff 1px, rgba(0, 0, 0, 0) 1px);
background-image: radial-gradient(#7c7c7c 1px, rgba(0, 0, 0, 0) 1px);
background-size: 20px 20px;
font-family: 'Google Sans', sans-serif; /* Apply Roboto font to the entire page */
font-family: 'Google Sans', sans-serif; /* Apply Google Sans font to the entire page */
}
</style>
</head>
<body class="bg-gray-100 flex items-center justify-center h-screen">
<body class="bg-neutral-100 dark:bg-neutral-900 dark:text-white flex items-center justify-center h-screen">
<!-- Logo -->
<div class="absolute top-4 left-4">
<img src="{{ url_for('static', filename='logo.webp') }}" alt="Logo" class="h-12">
<img id="logo" src="{{ url_for('static', filename='logo_black.webp') }}" alt="Logo" class="h-12 dark:hidden">
<img id="logoDark" src="{{ url_for('static', filename='logo_white.webp') }}" alt="Logo" class="h-12 hidden dark:block">
</div>
<div class="bg-white p-6 rounded-lg shadow-lg w-full max-w-md relative">
<h1 class="text-2xl font-bold mb-4 text-center">Upload Image for ALPR</h1>
<div class="bg-white dark:bg-neutral-800 p-6 rounded-lg shadow-lg w-full max-w-md relative">
<h1 class="text-2xl font-bold mb-4 text-center dark:text-gray-200">Upload Image for ALPR</h1>
<form id="uploadForm" enctype="multipart/form-data" class="space-y-4">
<div>
<label for="upload" class="block text-sm font-medium text-gray-700">Choose an image:</label>
<label for="upload" class="block text-sm font-medium text-gray-700 dark:text-gray-300">Choose an image:</label>
<div class="mt-1 flex items-center">
<input type="file" id="upload" name="upload" accept="image/*" class="hidden" onchange="updateFileName()">
<label for="upload" class="cursor-pointer inline-flex items-center justify-center px-4 py-2 border border-gray-300 rounded-md shadow-sm text-sm font-medium text-gray-700 bg-white hover:bg-gray-50">
<label for="upload" class="cursor-pointer inline-flex items-center justify-center px-4 py-2 border border-gray-400 rounded-md shadow-sm text-sm font-medium text-gray-700 dark:text-gray-300 bg-white dark:bg-neutral-800 hover:bg-neutral-50 dark:hover:bg-neutral-600">
Select file
</label>
<span id="fileName" class="ml-2 text-sm text-gray-600"></span>
<span id="fileName" class="ml-2 text-sm text-gray-600 dark:text-gray-300"></span>
</div>
</div>
<div id="imagePreview" class="mt-4 hidden">
<img id="previewImage" src="#" alt="Preview" class="max-w-full h-auto rounded-lg">
</div>
<button type="submit" class="w-full py-2 px-4 bg-blue-600 text-white font-semibold rounded-md shadow-sm hover:bg-blue-700">Upload</button>
<button type="submit" class="w-full py-2 px-4 bg-black text-white font-semibold rounded-md shadow-sm hover:bg-neutral-900 dark:bg-neutral-900 dark:hover:bg-neutral-950">Upload</button>
</form>
<div class="mt-6">
<h2 class="text-xl font-semibold mb-2">Response</h2>
<pre id="responseBox" class="bg-gray-100 p-4 border rounded-lg text-sm text-gray-800"></pre>
<h2 class="text-xl font-semibold mb-2 dark:text-gray-200">Response</h2>
<pre id="responseBox" class="bg-neutral-100 dark:bg-neutral-900 p-4 border rounded-lg text-sm text-gray-900 dark:text-gray-200"></pre>
</div>
</div>
@ -68,6 +69,26 @@
}
}
// Check for dark mode and switch logo accordingly
const prefersDarkScheme = window.matchMedia("(prefers-color-scheme: dark)");
function toggleLogo() {
const logo = document.getElementById('logo');
const logoDark = document.getElementById('logoDark');
if (prefersDarkScheme.matches) {
logo.style.display = 'none';
logoDark.style.display = 'block';
} else {
logo.style.display = 'block';
logoDark.style.display = 'none';
}
}
// Initial call to set logo based on dark mode preference
toggleLogo();
// Listen for changes in dark mode preference
prefersDarkScheme.addEventListener('change', toggleLogo);
$(document).ready(function () {
$('#uploadForm').on('submit', function (e) {
e.preventDefault();