Update app.py

app.py

@@ -3,15 +3,12 @@ import roboflow
 import pandas as pd
 import numpy as np
 import matplotlib.pyplot as plt
-import re
 import zipfile
 import tempfile
 import json
 from shapely.geometry import Polygon
 from PIL import Image
-from concurrent.futures import ThreadPoolExecutor
 from io import BytesIO
-from fpdf import FPDF
 
 # 🔥 Inicializar o modelo do Roboflow
 API_KEY = "mGkz7QhkhD90YfeiaOxV"
@@ -22,11 +19,11 @@ model = project.version("8").model
 # 📌 Configurações fixas do modelo
 model.confidence = 80  # Confiança do modelo
 model.overlap = 25     # Sobreposição fixada em 25%
+dpi_value = 300        # Resolução sempre em Alta (300 DPI)
 
 # 📌 Expander para Configurações Avançadas
 with st.expander("⚙️ Configurações Avançadas", expanded=True):
     model.confidence = st.slider("Confiança do Modelo (%)", 50, 100, 80)
-    resolution_option = st.radio("Escolha a Resolução da Imagem Exportada:", ["Baixa", "Média", "Alta"])
 
 # 📌 Função para calcular a área do polígono segmentado
 def calculate_polygon_area(points):
@@ -53,13 +50,9 @@ def process_image(image, image_name, progress_value):
         x_coords = [p['x'] for p in points] + [points[0]['x']]
         y_coords = [p['y'] for p in points] + [points[0]['y']]
 
-        # Ajustar DPI conforme escolha da resolução
-        dpi_options = {"Baixa": 72, "Média": 150, "Alta": 300}
-        selected_dpi = dpi_options[resolution_option]
-
         # Criar imagem segmentada
         segmented_buffer = BytesIO()
-        fig, ax = plt.subplots(figsize=(6, 6), dpi=selected_dpi)
+        fig, ax = plt.subplots(figsize=(6, 6), dpi=dpi_value)
         ax.imshow(image)
         ax.plot(x_coords, y_coords, color='red', linewidth=2)
         ax.set_title(f"Segmentação: {image_name}")
@@ -68,7 +61,7 @@ def process_image(image, image_name, progress_value):
 
         # Criar imagem do polígono
         polygon_buffer = BytesIO()
-        fig_polygon, ax_polygon = plt.subplots(figsize=(6, 6), dpi=selected_dpi)
+        fig_polygon, ax_polygon = plt.subplots(figsize=(6, 6), dpi=dpi_value)
         ax_polygon.plot(x_coords, y_coords, 'r-', linewidth=2)
         ax_polygon.scatter(x_coords, y_coords, color='red', s=5)
         ax_polygon.set_title("Contorno do Polígono")
@@ -124,36 +117,43 @@ elif upload_option == "Pasta de imagens":
 
     if uploaded_files:
         results_data = []
+        zip_images_buffer = BytesIO()
 
-        for i, uploaded_file in enumerate(uploaded_files):
-            image = Image.open(uploaded_file)
-            st.image(image, caption=f"Imagem Original - {uploaded_file.name}", use_container_width=True)
+        with zipfile.ZipFile(zip_images_buffer, "w") as zip_file:
+            for i, uploaded_file in enumerate(uploaded_files):
+                image = Image.open(uploaded_file)
+                st.image(image, caption=f"Imagem Original - {uploaded_file.name}", use_container_width=True)
 
-            # 📌 Barra de Progresso movida para após a exibição da imagem original
-            progress_value = int(((i + 1) / len(uploaded_files)) * 100)
-            progress_bar = st.progress(progress_value)
-            progress_text = st.text(f"Progresso: {progress_value}%")
+                progress_value = int(((i + 1) / len(uploaded_files)) * 100)
+                progress_bar = st.progress(progress_value)
+                progress_text = st.text(f"Progresso: {progress_value}%")
 
-            area, segmented_buffer, polygon_buffer, original_image = process_image(image, uploaded_file.name, progress_value)
+                area, segmented_buffer, polygon_buffer, original_image = process_image(image, uploaded_file.name, progress_value)
 
-            if area is not None:
-                results.append({"Imagem": uploaded_file.name, "Área Segmentada (px²)": area})
+                if area is not None:
+                    results.append({"Imagem": uploaded_file.name, "Área Segmentada (px²)": area})
 
-                # Mostrar as imagens processadas
-                st.image(segmented_buffer, caption="Segmentação", use_container_width=True)
-                st.image(polygon_buffer, caption="Polígono", use_container_width=True)
+                    # Adicionar imagens ao ZIP
+                    zip_file.writestr(f"segmentada_{uploaded_file.name}.png", segmented_buffer.getvalue())
+                    zip_file.writestr(f"poligono_{uploaded_file.name}.png", polygon_buffer.getvalue())
+
+                    # Mostrar as imagens processadas
+                    st.image(segmented_buffer, caption="Segmentação", use_container_width=True)
+                    st.image(polygon_buffer, caption="Polígono", use_container_width=True)
 
         if results:
             results_df = pd.DataFrame(results)
             st.write("📊 **Tabela de Resultados**")
             st.dataframe(results_df)
 
-            # Criar ZIP para download
-            with zipfile.ZipFile(zip_buffer, "w") as zip_file:
-                for uploaded_file, data in zip(uploaded_files, results_data):
-                    area, segmented_buffer, polygon_buffer, _ = data
-                    zip_file.writestr(f"segmentada_{uploaded_file.name}.png", segmented_buffer.getvalue())
-                    zip_file.writestr(f"poligono_{uploaded_file.name}.png", polygon_buffer.getvalue())
+            # Criar arquivo Excel
+            excel_buffer = BytesIO()
+            results_df.to_excel(excel_buffer, index=False)
+            excel_buffer.seek(0)
 
-            zip_buffer.seek(0)
-            st.download_button("📥 Baixar Todas as Imagens Segmentadas e Polígonos", zip_buffer, file_name="imagens_segmentadas.zip", mime="application/zip")
+            # Botão para baixar a tabela em Excel
+            st.download_button("📥 Baixar Tabela (Excel)", excel_buffer, file_name="resultados_segmentacao.xlsx", mime="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")
+
+            # Botão para baixar as imagens segmentadas e polígonos (ZIP)
+            zip_images_buffer.seek(0)
+            st.download_button("📥 Baixar Todas as Imagens Segmentadas e Polígonos", zip_images_buffer, file_name="imagens_segmentadas.zip", mime="application/zip")