Update app/materials_library.py

app/materials_library.py

@@ -368,17 +368,18 @@ def display_materials_page():
     if "fenestration_action" not in st.session_state:
         st.session_state.fenestration_action = {"action": None, "id": None}
 
-    # Process action queue
-    if st.session_state.action_queue:
+    # Process all actions in the queue without immediate rerun
+    while st.session_state.action_queue:
         action = st.session_state.action_queue.pop(0)
+        logger.info(f"Processing action: {action}")
         if action["type"] == "page_change":
             st.session_state.current_page = action["page"]
-            st.rerun()
+            st.session_state.module_rerun_flags["materials"] = True  # Request rerun via main.py
         elif action["type"] == "material_action":
             handle_material_action(action)
         elif action["type"] == "fenestration_action":
             handle_fenestration_action(action)
-        st.rerun()
+        # No rerun here to allow UI to update naturally
 
     # Apply custom CSS for button styling
     st.markdown("""
@@ -419,6 +420,7 @@ def display_materials_page():
 
 def handle_material_action(action: Dict[str, Any]):
     """Handle material-related actions."""
+    logger.info(f"Handling material action: {action}")
     if action["action"] == "preview":
         material = action["material"]
         name = action["name"]
@@ -451,6 +453,7 @@ def handle_material_action(action: Dict[str, Any]):
             "emissivity": float(material["emissivity"]),
             "colour": material["colour"]
         }
+        logger.info(f"Previewed material '{name}'")
     elif action["action"] == "copy":
         name = action["name"]
         material = action["material"]
@@ -495,6 +498,7 @@ def handle_material_action(action: Dict[str, Any]):
             "emissivity": float(material["emissivity"]),
             "colour": material["colour"]
         }
+        logger.info(f"Editing material '{name}'")
     elif action["action"] == "delete":
         name = action["name"]
         is_in_use = check_material_in_use(name)
@@ -507,6 +511,7 @@ def handle_material_action(action: Dict[str, Any]):
 
 def handle_fenestration_action(action: Dict[str, Any]):
     """Handle fenestration-related actions."""
+    logger.info(f"Handling fenestration action: {action}")
     if action["action"] == "preview":
         fenestration = action["fenestration"]
         name = action["name"]
@@ -533,6 +538,7 @@ def handle_fenestration_action(action: Dict[str, Any]):
             "embodied_carbon": float(fenestration["embodied_carbon"]),
             "cost": float(fenestration["cost"])
         }
+        logger.info(f"Previewed fenestration '{name}'")
     elif action["action"] == "copy":
         name = action["name"]
         fenestration = action["fenestration"]
@@ -571,6 +577,7 @@ def handle_fenestration_action(action: Dict[str, Any]):
             "embodied_carbon": float(fenestration["embodied_carbon"]),
             "cost": float(fenestration["cost"])
         }
+        logger.info(f"Editing fenestration '{name}'")
     elif action["action"] == "delete":
         name = action["name"]
         is_in_use = check_fenestration_in_use(name)
@@ -715,8 +722,8 @@ def display_materials_tab():
                     "U-Value (W/m²·K)": u_value
                 })
             df = pd.DataFrame(data)
+            st.session_state.project_data["materials"]["table"] = df  # Update table before rendering
             st.dataframe(df, use_container_width=True, hide_index=True)
-            st.session_state.project_data["materials"]["table"] = df
         else:
             st.info("No project materials to display.")
     
@@ -844,8 +851,8 @@ def display_fenestrations_tab():
                     "Cost (USD/m²)": props["cost"]
                 })
             df = pd.DataFrame(data)
+            st.session_state.project_data["fenestrations"]["table"] = df  # Update table before rendering
             st.dataframe(df, use_container_width=True, hide_index=True)
-            st.session_state.project_data["fenestrations"]["table"] = df
         else:
             st.info("No project fenestrations to display.")
     
@@ -1120,11 +1127,11 @@ def display_material_editor():
                         st.success(f"Material '{name}' added to your project.")
                         logger.info(f"Added new material '{name}' to project")
                     reset_material_editor()
-                    st.session_state.action_queue.append({"type": "refresh"})
+                    # Removed refresh action to allow natural re-render
         
         if clear_button:
             reset_material_editor()
-            st.session_state.action_queue.append({"type": "refresh"})
+            # Removed refresh action to allow natural re-render
 
 def display_fenestration_editor():
     """Display the fenestration editor form."""
@@ -1257,7 +1264,7 @@ def display_fenestration_editor():
                         "embodied_carbon": embodied_carbon,
                         "cost": cost
                     }
-                    if editor_state["edit_mode"]:
+                    if editorpiel["edit_mode"]:
                         original_name = editor_state["original_name"]
                         if original_name != name:
                             del st.session_state.project_data["fenestrations"]["project"][original_name]
@@ -1269,11 +1276,11 @@ def display_fenestration_editor():
                         st.success(f"Fenestration '{name}' added to your project.")
                         logger.info(f"Added new fenestration '{name}' to project")
                     reset_fenestration_editor()
-                    st.session_state.action_queue.append({"type": "refresh"})
+                    # Removed refresh action to allow natural re-render
         
         if clear_button:
             reset_fenestration_editor()
-            st.session_state.action_queue.append({"type": "refresh"})
+            # Removed refresh action to allow natural re-render
 
 def validate_material(
     name: str, category: str, thermal_conductivity: float, density: float,
@@ -1324,8 +1331,8 @@ def validate_material(
     colour_ranges = {
         "Light": (0.30, 0.50),
         "Medium": (0.60, 0.70),
-        "Dark": (0.85, 0.95),
-        "Reflective": (0.10, 0.20)
+        "Dark": (0.95),
+        "Reflective": (0.20)
     }
     min_abs, max_abs = colour_ranges[colour]
     if not (min_abs <= absorptivity <= max_abs):
@@ -1358,7 +1365,7 @@ def validate_fenestration(
         return False, "SHGC must be between 0 and 1."
     
     if visible_trans < 0 or visible_trans > 1:
-        return False, "Visible transmittance must be between 0 and 1."
+        return False, "Visible transmittence must be between {0} and {1}."
     
     if thickness <= 0:
         return False, "Thickness must be greater than zero."
@@ -1371,8 +1378,8 @@ def validate_fenestration(
     
     return True, ""
 
-def reset_material_editor():
-    """Reset the material editor and form state."""
+def reset_materials_editor():
+    """Reset the material editor and reset form state."""
     st.session_state.material_form_state = {
         "name": "",
         "category": MATERIAL_CATEGORIES[0],
@@ -1452,15 +1459,15 @@ def display_materials_help():
     
     **Materials Tab:**
     
-    * **Library Materials**: Pre-defined materials with standard thermal properties. Use 'Preview' to view details or 'Copy' to add to your project.
-    * **Project Materials**: Materials you've added to your project. Use 'Edit' to modify or 'Delete' to remove.
-    * **Material Editor/Creator**: Create new materials or edit existing project materials. Library materials can only be previewed.
+    - **Library Materials**: Pre-defined materials with standard thermal properties. Use 'Preview' to view details or 'Copy' to add to your project.
+    - **Project Materials**: Materials you've added to your project. Use 'Edit' to modify or 'Delete' to remove.
+    - **Material Editor/Creator**: Create new materials or edit existing project materials. Library materials can only be previewed.
     
     **Fenestrations Tab:**
     
-    * **Library Fenestrations**: Pre-defined windows, doors, and skylights. Use 'Preview' to view details or 'Copy' to add to your project.
-    * **Project Fenestrations**: Fenestrations you've added to your project. Use 'Edit' to modify or 'Delete' to remove.
-    * **Fenestration Editor/Creator**: Create new fenestrations or edit existing project fenestrations. Library fenestrations can only be previewed.
+    - **Library Fenestrations**: Pre-defined windows, doors, and skylights. Use 'Preview' to view details or 'Copy' to add to your project.
+    - **Project Fenestrations**: Fenestrations you've added to your project. Use 'Edit' to modify or 'Delete' to remove.
+    - **Fenestration Editor/Creator**: Create new fenestrations or edit existing project fenestrations. Library fenestrations can only be previewed.
     
     **Key Properties:**
     
@@ -1468,7 +1475,7 @@ def display_materials_help():
     * **Density (kg/m³)**: Mass per unit volume.
     * **Specific Heat (J/kg·K)**: Energy required to raise the temperature of 1 kg by 1 K. Higher values indicate better thermal mass.
     * **Thermal Mass (J/m²·K)**: Areal heat capacity (density × specific heat × thickness).
-    * **U-Value (W/m²·K)**: Overall heat transfer coefficient, accounting for material and surface resistances. Lower values indicate better insulation.
+    * **U-Value (W/m²·K)**: Overall heat transfer coefficient, accounting for material{eq surfaces resistances. Lower values indicate better insulation.
     * **SHGC**: Solar Heat Gain Coefficient (0-1). Fraction of incident solar radiation that enters through a fenestration.
     * **Visible Transmittance**: Fraction of visible light that passes through a fenestration.
     * **Embodied Carbon**: Carbon emissions associated with material production, measured in kg CO₂e per unit volume or area.