Update app/components.py

app/components.py

@@ -15,7 +15,6 @@ import pandas as pd
 import numpy as np
 import json
 import logging
-import uuid
 from typing import Dict, List, Any, Optional, Tuple, Union
 from app.m_c_data import DEFAULT_WINDOW_PROPERTIES  # Import DEFAULT_WINDOW_PROPERTIES
 from app.materials_library import GlazingMaterial  # Added import for GlazingMaterial
@@ -94,8 +93,8 @@ def migrate_component_types():
             if comp_type != "floors" and "tilt" in component:
                 component["surface_tilt"] = component.pop("tilt")
                 logger.info(f"Renamed 'tilt' to 'surface_tilt' for component '{component['name']}'")
-            # Add adiabatic and ground_contact if not present for walls and floors
-            if comp_type in ["walls", "floors"]:
+            # Add adiabatic and ground_contact if not present for walls, roofs, and floors
+            if comp_type in ["walls", "roofs", "floors"]:
                 if "adiabatic" not in component:
                     component["adiabatic"] = False
                     logger.info(f"Added 'adiabatic' to component '{component['name']}'")
@@ -211,8 +210,8 @@ def display_component_tab(comp_type: str):
                     help="Tilt angle of the component relative to horizontal (0° = horizontal, 90° = vertical)."
                 )
             
-            # Adiabatic and Ground Contact for walls and floors
-            if comp_type in ["walls", "floors"]:
+            # Adiabatic and Ground Contact for walls, roofs, and floors
+            if comp_type in ["walls", "roofs", "floors"]:
                 adiabatic = st.selectbox(
                     "Adiabatic",
                     ["Yes", "No"],
@@ -341,7 +340,7 @@ def display_component_tab(comp_type: str):
                 component_data["surface_azimuth"] = surface_azimuth
                 component_data["surface_tilt"] = surface_tilt
             
-            if comp_type in ["walls", "floors"]:
+            if comp_type in ["walls", "roofs", "floors"]:
                 component_data["adiabatic"] = adiabatic == "Yes"
                 component_data["ground_contact"] = ground_contact == "Yes"
             
@@ -472,15 +471,17 @@ def display_wall_window_table(comp_type: str, components: List[Dict[str, Any]]):
 def display_roof_skylight_table(comp_type: str, components: List[Dict[str, Any]]):
     """Display a table of roofs or skylights with appropriate columns."""
     # Create column headers
-    cols = st.columns([2, 1, 1, 1, 1, 1, 1] if comp_type == "roofs" else [2, 1, 1, 1, 1, 1, 1, 1])
+    cols = st.columns([2, 1, 1, 1, 1, 1, 1, 1, 1] if comp_type == "roofs" else [2, 1, 1, 1, 1, 1, 1, 1])
     cols[0].write("**Name**")
     cols[1].write("**U-Value**")
     cols[2].write("**Area (m²)**")
     cols[3].write("**Surface Azimuth (°)**")
     cols[4].write("**Surface Tilt (°)**")
     if comp_type == "roofs":
-        cols[5].write("**Edit**")
-        cols[6].write("**Delete**")
+        cols[5].write("**Adiabatic**")
+        cols[6].write("**Ground Contact**")
+        cols[7].write("**Edit**")
+        cols[8].write("**Delete**")
     else:  # skylights
         cols[5].write("**SC**")
         cols[6].write("**Edit**")
@@ -488,18 +489,21 @@ def display_roof_skylight_table(comp_type: str, components: List[Dict[str, Any]]
     
     # Display each component
     for idx, comp in enumerate(components):
-        cols = st.columns([2, 1, 1, 1, 1, 1, 1] if comp_type == "roofs" else [2, 1, 1, 1, 1, 1, 1, 1])
+        cols = st.columns([2, 1, 1, 1, 1, 1, 1, 1, 1] if comp_type == "roofs" else [2, 1, 1, 1, 1, 1, 1, 1])
         cols[0].write(comp["name"])
         cols[1].write(f"{comp.get('u_value', 0.0):.3f}")
         cols[2].write(f"{comp['area']:.2f}")
         cols[3].write(f"{comp.get('surface_azimuth', 0.0):.0f}")
         cols[4].write(f"{comp.get('surface_tilt', 0.0):.0f}")
-        if comp_type == "skylights":
+        if comp_type == "roofs":
+            cols[5].write("Yes" if comp.get("adiabatic", False) else "No")
+            cols[6].write("Yes" if comp.get("ground_contact", False) else "No")
+        else:  # skylights
             cols[5].write(f"{comp.get('shading_coefficient', 1.0):.2f}")
         
         # Edit button
         edit_key = f"edit_{comp_type}_{comp['name']}_{idx}"
-        edit_col = 5 if comp_type == "roofs" else 6
+        edit_col = 7 if comp_type == "roofs" else 6
         with cols[edit_col].container():
             if st.button("Edit", key=edit_key):
                 editor_data = {
@@ -514,6 +518,8 @@ def display_roof_skylight_table(comp_type: str, components: List[Dict[str, Any]]
                 
                 if comp_type == "roofs":
                     editor_data["construction"] = comp.get("construction", "")
+                    editor_data["adiabatic"] = comp.get("adiabatic", False)
+                    editor_data["ground_contact"] = comp.get("ground_contact", False)
                 else:  # skylights
                     editor_data["fenestration"] = comp.get("fenestration", "")
                     editor_data["parent_component"] = comp.get("parent_component", "")
@@ -526,7 +532,7 @@ def display_roof_skylight_table(comp_type: str, components: List[Dict[str, Any]]
         
         # Delete button
         delete_key = f"delete_{comp_type}_{comp['name']}_{idx}"
-        delete_col = 6 if comp_type == "roofs" else 7
+        delete_col = 8 if comp_type == "roofs" else 7
         with cols[delete_col].container():
             if st.button("Delete", key=delete_key):
                 st.session_state.project_data["components"][comp_type].pop(idx)
@@ -688,8 +694,8 @@ def display_components_help():
     * **Surface Tilt**: Angle of the component relative to horizontal (0° = horizontal, 90° = vertical).
     * **Parent Component**: The wall or roof that contains a window or skylight.
     * **Shading Coefficient (SC)**: Factor for shading devices on windows/skylights (0.0 to 1.0).
-    * **Adiabatic**: Indicates if a wall or floor has no heat transfer across it (Yes/No).
-    * **Ground Contact**: Indicates if a wall or floor is in contact with the ground (Yes/No).
+    * **Adiabatic**: Indicates if a wall, roof, or floor has no heat transfer across it (Yes/No).
+    * **Ground Contact**: Indicates if a wall, roof, or floor is in contact with the ground (Yes/No).
     
     **Workflow:**