Update app.py

app.py

@@ -45,34 +45,29 @@ def update_texture(*component_values):
 def on_random_click():
     random_values = randomize_texture()
     texture = generate_texture(*random_values)
-    # Prepare updates for sliders and the image
     updates = [gr.update(value=value) for value in random_values]
     updates.append(texture)
     return updates
 
 def process_uploaded_image(uploaded_image):
-    # Resize the image to match the texture size
     resized_image = cv2.resize(uploaded_image, (TEXTURE_SIZE, TEXTURE_SIZE))
     resized_image = cv2.cvtColor(resized_image, cv2.COLOR_RGB2BGR)
     flattened_image = resized_image.flatten()
 
-    # Project the image into the PCA component space
     centered_image = flattened_image - mean_texture
     coefficients = np.dot(centered_image, components.T)
-    
-    # Clip the coefficients within the allowed slider ranges
     clipped_coefficients = [np.clip(coeff, -slider_ranges[i], slider_ranges[i]) for i, coeff in enumerate(coefficients)]
     return clipped_coefficients
 
 def on_image_upload(image):
-    # Process the uploaded image and get PCA coefficients
     coefficients = process_uploaded_image(image)
-    texture = generate_texture(*coefficients)
-    # Update sliders and image
     updates = [gr.update(value=value) for value in coefficients]
-    updates.append(texture)
     return updates
 
+def on_update_click(*component_values):
+    texture = generate_texture(*component_values)
+    return texture
+
 # Create Gradio interface
 with gr.Blocks() as demo:
     with gr.Row():
@@ -88,24 +83,27 @@ with gr.Blocks() as demo:
                     label=component_names[i]
                 )
                 sliders.append(slider)
+
+            update_texture_button = gr.Button("Update Texture")
+            random_button = gr.Button("Randomize Texture")
+            get_components_button = gr.Button("Get Components from Image")
+        
         with gr.Column():
             output_image = gr.Image(
                 label="Generated Texture"
             )
-            random_button = gr.Button("Randomize Texture")
             upload_image = gr.Image(
                 label="Upload Image",
                 sources=['upload', 'clipboard'],
                 type="numpy"
             )
     
-    # Update texture when any slider changes
-    for slider in sliders:
-        slider.change(
-            fn=update_texture,
-            inputs=sliders,
-            outputs=output_image
-        )
+    # Update texture when clicking the "Update Texture" button
+    update_texture_button.click(
+        fn=on_update_click,
+        inputs=sliders,
+        outputs=output_image
+    )
 
     # Randomize texture and update sliders and image
     random_button.click(
@@ -114,11 +112,18 @@ with gr.Blocks() as demo:
         outputs=[*sliders, output_image]
     )
 
-    # Update sliders and image based on uploaded image
-    upload_image.change(
+    # Update sliders based on the uploaded image when clicking "Get Components from Image"
+    get_components_button.click(
         fn=on_image_upload,
         inputs=upload_image,
-        outputs=[*sliders, output_image]
+        outputs=sliders
+    )
+
+    # Keep the uploaded image for reference (no update on texture yet)
+    upload_image.change(
+        fn=None,
+        inputs=None,
+        outputs=[]
     )
 
-demo.launch()
+demo.launch()