Update app.py

app.py

@@ -52,18 +52,16 @@ def zoom_at(img, x, y, zoom):
     Returns:
     -------
     PIL.Image
-        Zoomed image.
-
-    Examples:
-    --------
-    >>> img = Image.open('image.jpg')
-    >>> zoomed_img = zoom_at(img, x=100, y=100, zoom=2.0)
+        Zoomed image resized to 500x500 pixels.
     '''
     w, h = img.size
-    zoom2 = zoom * 2
-    img = img.crop((x - w / zoom2, y - h / zoom2,
-                    x + w / zoom2, y + h / zoom2))
-    return img.resize((w, h), Image.LANCZOS)
+    zoom_half = zoom / 2
+    left = max(x - w * zoom_half, 0)
+    upper = max(y - h * zoom_half, 0)
+    right = min(x + w * zoom_half, w)
+    lower = min(y + h * zoom_half, h)
+    img_cropped = img.crop((left, upper, right, lower))
+    return img_cropped.resize((500, 500), Image.LANCZOS)
 
 def apply_enhancements(img, x, y, zoom, contrast, brightness, sharpness):
     '''
@@ -89,13 +87,13 @@ def apply_enhancements(img, x, y, zoom, contrast, brightness, sharpness):
     Returns:
     -------
     PIL.Image
-        Enhanced image.
+        Enhanced image resized to 500x500 pixels.
     '''
     zoomed = zoom_at(img, x, y, zoom)
     enhanced_contrast = ImageEnhance.Contrast(zoomed).enhance(contrast)
     enhanced_brightness = ImageEnhance.Brightness(enhanced_contrast).enhance(brightness)
     enhanced_sharpness = ImageEnhance.Sharpness(enhanced_brightness).enhance(sharpness)
-    return enhanced_sharpness
+    return enhanced_sharpness.resize((500, 500), Image.LANCZOS)
 
 def create_zip(processed_img, description, params):
     '''
@@ -115,9 +113,7 @@ def create_zip(processed_img, description, params):
     bytes
         Byte content of the zip file.
     '''
-    # Create a temporary directory
     with tempfile.TemporaryDirectory() as tmpdirname:
-        # Define file paths
         img_path = os.path.join(tmpdirname, "processed_image.jpg")
         desc_path = os.path.join(tmpdirname, "description.txt")
         params_path = os.path.join(tmpdirname, "parameters.json")
@@ -132,7 +128,7 @@ def create_zip(processed_img, description, params):
         # Save parameters
         pd.DataFrame([params]).to_json(params_path, orient="records")
 
-        # Create a zip file in memory
+        # Create zip
         zip_buffer = io.BytesIO()
         with zipfile.ZipFile(zip_buffer, "w") as zipf:
             zipf.write(img_path, arcname="processed_image.jpg")
@@ -142,6 +138,7 @@ def create_zip(processed_img, description, params):
         zip_buffer.seek(0)
         return zip_buffer
 
+# Streamlit App Configuration
 st.set_page_config(page_title="CLL Explorer", layout="wide")
 st.title("CLL Explorer: Cell Image Analysis Prep Tool")
 
@@ -163,7 +160,7 @@ if uploaded_files:
         format_func=lambda x: uploaded_files[x].name
     )
     img_data = uploaded_files[img_index].read()
-    img = Image.open(io.BytesIO(img_data)).resize((500, 500))
+    img = Image.open(io.BytesIO(img_data)).convert("RGB").resize((500, 500))
 
     # Create columns with image on the left and controls on the right
     image_col, controls_col = st.columns([3, 1])
@@ -171,20 +168,20 @@ if uploaded_files:
     with image_col:
         st.subheader("Processed Image")
         if 'processed_img' in st.session_state:
-            st.image(st.session_state.processed_img, use_container_width=True, caption="Processed Image")
+            st.image(st.session_state.processed_img, use_column_width=True, caption="Processed Image")
         else:
-            st.image(img, use_container_width=True, caption="Processed Image")
+            st.image(img, use_column_width=True, caption="Processed Image")
 
     with controls_col:
         st.subheader("Image Controls")
         x = st.slider("X Coordinate", 0, 500, 250)
         y = st.slider("Y Coordinate", 0, 500, 250)
-        zoom = st.slider("Zoom", 1, 10, 5)
+        zoom = st.slider("Zoom", 1.0, 10.0, 5.0, step=0.1)
 
         with st.expander("Enhancement Settings", expanded=True):
-            contrast = st.slider("Contrast", 0.0, 5.0, 1.0)
-            brightness = st.slider("Brightness", 0.0, 5.0, 1.0)
-            sharpness = st.slider("Sharpness", 0.0, 2.0, 1.0)
+            contrast = st.slider("Contrast", 0.0, 5.0, 1.0, step=0.1)
+            brightness = st.slider("Brightness", 0.0, 5.0, 1.0, step=0.1)
+            sharpness = st.slider("Sharpness", 0.0, 2.0, 1.0, step=0.1)
 
         if st.button("Apply Adjustments"):
             processed_img = apply_enhancements(img, x, y, zoom, contrast, brightness, sharpness)
@@ -195,13 +192,12 @@ if uploaded_files:
 
     # Display Original Image Below
     st.subheader("Original Image")
-    st.image(img, use_container_width=True, caption="Original Image")
+    st.image(img, use_column_width=True, caption="Original Image")
 
-    # Save Options
+    # Save and Export Options
     st.markdown("---")
     st.subheader("Save and Export Options")
 
-    # Description and Parameters Inputs
     with st.expander("Add Annotations", expanded=True):
         description = st.text_area("Describe the image", "")
         params = {
@@ -213,7 +209,6 @@ if uploaded_files:
             "sharpness": sharpness
         }
 
-    # Create a button to prepare the zip file
     if st.button("Prepare Download"):
         if 'processed_img' in st.session_state and description:
             zip_buffer = create_zip(st.session_state.processed_img, description, params)
@@ -227,12 +222,13 @@ if uploaded_files:
         else:
             st.warning("Ensure that the processed image is available and description is provided.")
 
-    # Optional: Separate Save Image Checkbox
+    # Optional: Save Processed Image Locally
     save_image = st.checkbox("Save Processed Image Locally")
     if save_image:
         if 'processed_img' in st.session_state:
-            st.session_state.processed_img.save("image-processed.jpg")
-            st.success("Image saved as `image-processed.jpg`")
+            processed_img_path = os.path.join("processed_image_500x500.jpg")
+            st.session_state.processed_img.save(processed_img_path)
+            st.success(f"Image saved as `{processed_img_path}`")
         else:
             st.warning("No processed image to save.")
 
@@ -240,13 +236,19 @@ if uploaded_files:
     if st.button("Rename Files"):
         if 'processed_img' in st.session_state:
             file_ext = str(np.random.randint(100))
-            os.rename("image-processed.jpg", f"img_processed{file_ext}.jpg")
-            with open("saved_image_parameters.json", "w") as f:
-                f.write(pd.DataFrame([params]).to_json(orient="records"))
-            os.rename("saved_image_parameters.json", f"saved_image_parameters{file_ext}.json")
-            with open("saved_image_description.txt", "w") as f:
+            new_img_name = f"img_processed_{file_ext}.jpg"
+            processed_img_path = "processed_image_500x500.jpg"
+            if os.path.exists(processed_img_path):
+                os.rename(processed_img_path, new_img_name)
+
+            # Save parameters and description
+            params_path = f"parameters_{file_ext}.json"
+            description_path = f"description_{file_ext}.txt"
+
+            pd.DataFrame([params]).to_json(params_path, orient="records")
+            with open(description_path, "w") as f:
                 f.write(description)
-            os.rename("saved_image_description.txt", f"saved_image_description{file_ext}.txt")
-            st.success("Files renamed successfully")
+
+            st.success(f"Files renamed to `{new_img_name}`, `{params_path}`, and `{description_path}`")
         else:
             st.warning("No processed image to rename.")