Added ability to process 'tif' and 'tiff' images. Work of gr.Examples is extended to gr.ImageEditor. Work of introjs is fixed.

Author: rybakov-ks

particleanalyzer/core/ui.py

@@ -138,7 +138,21 @@ def create_interface(api_key):
                                     elem_classes="styled-dropdown",
                                 )
                             with gr.Row() as row_image_file:
-                                image_file = gr.File(label=i18n("Загрузить изображение СЭМ"), file_types=[".tif", ".tiff", ".png", ".jpg", ".jpeg", ".bmp", ".webp"], file_count="single", elem_id="image-file",)  
+                                image_file = gr.File(
+                                    label=i18n("Загрузить изображение СЭМ"),
+                                    file_types=[
+                                        ".tif",
+                                        ".tiff",
+                                        ".png",
+                                        ".jpg",
+                                        ".jpeg",
+                                        ".bmp",
+                                        ".webp",
+                                    ],
+                                    file_count="single",
+                                    elem_id="image-file",
+                                    height=450,
+                                )
                             with gr.Row(visible=False) as row_analysis:
                                 with gr.Column():
                                     with gr.Row(
@@ -195,7 +209,8 @@ def create_interface(api_key):
                                                 show_copy_button=True,
                                             )
                                     with gr.Row(
-                                        visible=False, elem_id="reset-delete-buttons-row"
+                                        visible=False,
+                                        elem_id="reset-delete-buttons-row",
                                     ) as reset_delete_buttons_row:
                                         with gr.Column():
                                             reset_df = gr.Button(
@@ -235,14 +250,14 @@ def create_interface(api_key):
                                                 elem_classes="custom-btn btn-clear",
                                             )
 
-                    with gr.Row(elem_id="example-row") as in_image_example_row:
+                    with gr.Row(elem_id="example-row"):
                         gr.Examples(
                             examples=[
-                                "https://raw.githubusercontent.com/rybakov-ks/ParticleAnalyzer/main/example/100%20r-.jpg",
-                                "https://raw.githubusercontent.com/rybakov-ks/ParticleAnalyzer/main/example/Tv30_1.webp",
-                                "https://raw.githubusercontent.com/rybakov-ks/ParticleAnalyzer/main/example/A02-1.webp",
-                                "https://raw.githubusercontent.com/rybakov-ks/ParticleAnalyzer/main/example/Resolution%20in%20SEM%201.jpg",
-                                "https://raw.githubusercontent.com/rybakov-ks/ParticleAnalyzer/main/example/image_c_01.webp",
+                                "https://raw.githubusercontent.com/rybakov-ks/ParticleAnalyzer/refs/heads/main/example/Cathode_LiCoVO4.jpg",
+                                "https://raw.githubusercontent.com/rybakov-ks/ParticleAnalyzer/refs/heads/main/example/Chitosan.webp",
+                                "https://raw.githubusercontent.com/rybakov-ks/ParticleAnalyzer/refs/heads/main/example/Silicon_oxide.webp",
+                                "https://raw.githubusercontent.com/rybakov-ks/ParticleAnalyzer/refs/heads/main/example/Gold_on_carbon.jpg",
+                                "https://raw.githubusercontent.com/rybakov-ks/ParticleAnalyzer/refs/heads/main/example/Colloidal_silver.webp",
                             ],
                             inputs=[image_file],
                             label=i18n("Примеры"),
@@ -541,7 +556,11 @@ def create_interface(api_key):
                 # </button>
                 # """
                 # )
-        image_file.change(fn=handle_file_upload, inputs=[image_file, scale_selector], outputs=[in_image, im, row_image_file, row_analysis])      
+        image_file.change(
+            fn=handle_file_upload,
+            inputs=[image_file, scale_selector],
+            outputs=[in_image, im, row_image_file, row_analysis],
+        )
         analyze = process_button.click(
             fn=analyzer.analyze_image,
             inputs=[
@@ -626,7 +645,7 @@ def create_interface(api_key):
                 I_slider,
             ],
             show_progress="hide",
-            show_progress_on=[points_df]
+            show_progress_on=[points_df],
         ).success(
             fn=statistic_an,
             inputs=[

particleanalyzer/core/utils.py

@@ -5,7 +5,6 @@
 from PIL import Image
 import csv
 import os
-from pathlib import Path
 from datetime import datetime
 from particleanalyzer.core.languages import translations
 from particleanalyzer.core.language_context import LanguageContext
@@ -127,7 +126,7 @@ def reset_interface(scale_value):
         [(None, None)],  # Очищаем chatbot
         gr.update(visible=False),  # Скрываем строку results_row
         gr.update(visible=False),  # Скрываем sidebar
-        gr.update(visible=True),   # Показываем строку row_image_file
+        gr.update(visible=True),  # Показываем строку row_image_file
         gr.update(visible=False),  # Скрываем строку row_analysis
         None,  # Очищаем image_file
     )
@@ -333,7 +332,11 @@ def statistic_an(
             )
     selected_image = cv2.cvtColor(selected_image, cv2.COLOR_BGR2RGB)
 
-    return selected_image, stats_df, fig, 
+    return (
+        selected_image,
+        stats_df,
+        fig,
+    )
 
 
 selected_particles = []  # Глобальный список для хранения выбранных частиц
@@ -395,7 +398,9 @@ def reset_selection(output_table_image2):
     )
 
 
-def particle_removal(output_table_image2, points_df, output_table, round_value, scale_selector):
+def particle_removal(
+    output_table_image2, points_df, output_table, round_value, scale_selector
+):
     global selected_particles
     if not output_table_image2.empty and "№" in output_table_image2.columns:
         try:
@@ -415,9 +420,9 @@ def particle_removal(output_table_image2, points_df, output_table, round_value,
     limits = ParticleAnalyzer.calculate_limits(output_table, round_value)
     scale_selector = ParticleAnalyzer.SCALE_OPTIONS[scale_selector]
     return (
-        gr.update(visible=False), 
-        gr.update(visible=False), 
-        points_df, 
+        gr.update(visible=False),
+        gr.update(visible=False),
+        points_df,
         output_table,
         gr.update(
             minimum=limits["d_max_min"],
@@ -428,9 +433,9 @@ def particle_removal(output_table_image2, points_df, output_table, round_value,
         ),
         gr.update(
             minimum=limits["d_min_min"],
-            maximum=limits["d_min_max"] ,
-            value=(limits["d_min_min"], limits["d_min_max"] ),
-            step=limits["d_min_max"]  * 0.01,
+            maximum=limits["d_min_max"],
+            value=(limits["d_min_min"], limits["d_min_max"]),
+            step=limits["d_min_max"] * 0.01,
             label=f"Dₘᵢₙ [{get_translation(scale_selector['unit'])}]",
         ),
         gr.update(
@@ -458,9 +463,14 @@ def particle_removal(output_table_image2, points_df, output_table, round_value,
             step=limits["P_max"] * 0.01,
             label=f"P [{get_translation(scale_selector['unit'])}]",
         ),
-        gr.update(minimum=limits["I_min"], maximum=limits["I_max"], value=(limits["I_min"], limits["I_max"])),
+        gr.update(
+            minimum=limits["I_min"],
+            maximum=limits["I_max"],
+            value=(limits["I_min"], limits["I_max"]),
+        ),
     )
 
+
 def img_to_numpy_array(file_path):
     try:
         with Image.open(file_path) as img:
@@ -469,15 +479,13 @@ def img_to_numpy_array(file_path):
     except Exception as e:
         print(f"Ошибка при загрузке TIFF: {e}")
         return None, None
-        
+
+
 def handle_file_upload(file, scale_selector):
     if file is None:
         return gr.skip(), gr.skip(), gr.update(visible=True), gr.update(visible=False)
-    
-    scale = ParticleAnalyzer.SCALE_OPTIONS[scale_selector]["scale"]
-    
+
     file_path = file.name
-    file_ext = Path(file_path).suffix.lower()[1:]
     in_image, im = img_to_numpy_array(file_path)
 
     return (
@@ -487,6 +495,7 @@ def handle_file_upload(file, scale_selector):
         gr.update(visible=True),
     )
 
+
 empty_df_ParticleCharacteristics = get_columns("Pixels").fillna("")
 empty_df_ParticleStatistics = get_stats_columns()
 

particleanalyzer/version.py

@@ -1 +1 @@
-__version__ = "0.1.38"
+__version__ = "1.0.0"

setup.py

@@ -9,7 +9,7 @@ def read_file(filename):
 
 setup(
     name="ParticleAnalyzer",
-    version="0.1.38",
+    version="1.0.0",
     packages=find_packages(exclude=["tests*"]),
     package_data={
         "particleanalyzer": [