Update app/components.py

app/components.py

@@ -2,7 +2,7 @@
 BuildSustain - Building Components Module
 
 This module handles the definition of building envelope components (walls, roofs, floors,
-windows, doors, skylights) for the BuildSustain application. It allows users to
+windows, skylights) for the BuildSustain application. It allows users to
 assign constructions and fenestrations to specific components, define their areas,
 orientations, and other relevant properties.
 
@@ -23,7 +23,7 @@ logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(
 logger = logging.getLogger(__name__)
 
 # Define constants
-COMPONENT_TYPES = ["Wall", "Roof", "Floor", "Window", "Door", "Skylight"]
+COMPONENT_TYPES = ["Walls", "Roofs", "Floors", "Windows", "Skylights"]
 ORIENTATION_OPTIONS = ["A (North)", "B (South)", "C (East)", "D (West)", "Custom"]
 ORIENTATION_MAP = {'A (North)': 0.0, 'B (South)': 180.0, 'C (East)': 90.0, 'D (West)': 270.0, 'Custom': 0.0}
 
@@ -33,7 +33,7 @@ def display_components_page():
     This is the main function called by main.py when the Building Components page is selected.
     """
     st.title("Building Components")
-    st.write("Define walls, roofs, floors, windows, doors, and skylights based on ASHRAE 2005 Handbook of Fundamentals.")
+    st.write("Define walls, roofs, floors, windows, and skylights based on ASHRAE 2005 Handbook of Fundamentals.")
     
     # Display help information in an expandable section
     with st.expander("Help & Information"):
@@ -55,7 +55,7 @@ def display_components_page():
     
     for i, component_type in enumerate(COMPONENT_TYPES):
         with tabs[i]:
-            display_component_tab(component_type.lower() + "s")
+            display_component_tab(component_type.lower())
     
     # Navigation buttons
     col1, col2 = st.columns(2)
@@ -78,7 +78,6 @@ def initialize_components():
             "roofs": [],
             "floors": [],
             "windows": [],
-            "doors": [],
             "skylights": []
         }
 
@@ -98,7 +97,7 @@ def display_component_tab(comp_type: str):
     # Get available items for this component type
     if comp_type in ["walls", "roofs", "floors"]:
         available_items = get_available_constructions()
-    else:  # Windows, doors, skylights
+    else:  # Windows, skylights
         available_items = get_available_fenestrations()
     
     # Split the display into two columns
@@ -115,8 +114,6 @@ def display_component_tab(comp_type: str):
                 display_roof_skylight_table(comp_type, components)
             elif comp_type == "floors":
                 display_floor_table(comp_type, components)
-            else:  # doors
-                display_door_table(comp_type, components)
         else:
             st.write(f"No {comp_type} defined.")
     
@@ -156,7 +153,7 @@ def display_component_tab(comp_type: str):
             )
             
             # Component-specific inputs
-            if comp_type in ["walls", "windows", "doors", "roofs", "skylights"]:
+            if comp_type in ["walls", "windows", "roofs", "skylights"]:
                 # Elevation (orientation)
                 elevation = st.selectbox(
                     "Elevation",
@@ -169,9 +166,10 @@ def display_component_tab(comp_type: str):
                 rotation = st.number_input(
                     "Rotation (°)",
                     min_value=0.0,
-                    max_value=359.9,
+                    max_value=359.0,
                     value=float(editor_state.get("rotation", 0.0)),
-                    format="%.1f",
+                    step=1.0,
+                    format="%.0f",
                     help="Rotation angle in degrees to adjust the elevation (0° = North, 90° = East, 180° = South, 270° = West)."
                 )
                 
@@ -186,7 +184,8 @@ def display_component_tab(comp_type: str):
                     min_value=0.0,
                     max_value=180.0,
                     value=float(editor_state.get("tilt", default_tilt)),
-                    format="%.1f",
+                    step=1.0,
+                    format="%.0f",
                     help="Tilt angle of the component relative to horizontal (0° = horizontal, 90° = vertical)."
                 )
             
@@ -197,7 +196,8 @@ def display_component_tab(comp_type: str):
                     min_value=0.0,
                     max_value=100.0,
                     value=float(editor_state.get("contact_with_ground_percentage", 0.0)),
-                    format="%.1f",
+                    step=1.0,
+                    format="%.0f",
                     help="Percentage of the floor in contact with the ground (0% = fully above ground, 100% = fully in contact)."
                 )
             
@@ -218,7 +218,6 @@ def display_component_tab(comp_type: str):
                 # Extract material properties from the first layer
                 absorptivity = 0.7
                 emissivity = 0.9
-                colour = "Unknown"
                 if construction in available_items and "layers" in available_items[construction]:
                     first_layer = available_items[construction]["layers"][0]
                     if "material" in first_layer:
@@ -226,38 +225,14 @@ def display_component_tab(comp_type: str):
                         if material_data:
                             absorptivity = material_data.get("absorptivity", 0.7)
                             emissivity = material_data.get("emissivity", 0.9)
-                            colour = material_data.get("colour", "Unknown")
-                
-                # Material property inputs
-                absorptivity = st.number_input(
-                    "Absorptivity",
-                    min_value=0.0,
-                    max_value=1.0,
-                    value=float(editor_state.get("absorptivity", absorptivity)),
-                    format="%.2f",
-                    help="Solar absorptivity of the component's outer surface (0.0 to 1.0)."
-                )
-                emissivity = st.number_input(
-                    "Emissivity",
-                    min_value=0.0,
-                    max_value=1.0,
-                    value=float(editor_state.get("emissivity", emissivity)),
-                    format="%.2f",
-                    help="Thermal emissivity of the component's outer surface (0.0 to 1.0)."
-                )
-                colour = st.text_input(
-                    "Colour",
-                    value=editor_state.get("colour", colour),
-                    help="Colour of the component's outer surface."
-                )
             
-            else:  # Windows, doors, skylights
+            else:  # Windows, skylights
                 # For fenestrations, we need to select a parent component
                 parent_components = get_parent_components(comp_type)
                 
                 parent_options = list(parent_components.keys())
                 if not parent_options:
-                    st.error(f"No parent components available. Please create walls/roofs first.")
+                    st.error(f"No parent components available. Please create {'walls' if comp_type == 'windows' else 'roofs'} first.")
                     parent_options = [""]
                 
                 parent_component = st.selectbox(
@@ -279,53 +254,15 @@ def display_component_tab(comp_type: str):
                     help="Select the fenestration type for this component."
                 )
                 
-                if comp_type == "doors":
-                    # Extract material properties from the first layer
-                    absorptivity = 0.7
-                    emissivity = 0.9
-                    colour = "Unknown"
-                    if fenestration in available_items and "layers" in available_items[fenestration]:
-                        first_layer = available_items[fenestration]["layers"][0]
-                        if "material" in first_layer:
-                            material_data = get_material_data(first_layer["material"])
-                            if material_data:
-                                absorptivity = material_data.get("absorptivity", 0.7)
-                                emissivity = material_data.get("emissivity", 0.9)
-                                colour = material_data.get("colour", "Unknown")
-                    
-                    # Material property inputs
-                    absorptivity = st.number_input(
-                        "Absorptivity",
-                        min_value=0.0,
-                        max_value=1.0,
-                        value=float(editor_state.get("absorptivity", absorptivity)),
-                        format="%.2f",
-                        help="Solar absorptivity of the door's outer surface (0.0 to 1.0)."
-                    )
-                    emissivity = st.number_input(
-                        "Emissivity",
-                        min_value=0.0,
-                        max_value=1.0,
-                        value=float(editor_state.get("emissivity", emissivity)),
-                        format="%.2f",
-                        help="Thermal emissivity of the door's outer surface (0.0 to 1.0)."
-                    )
-                    colour = st.text_input(
-                        "Colour",
-                        value=editor_state.get("colour", colour),
-                        help="Colour of the door's outer surface."
-                    )
-                
-                if comp_type in ["windows", "skylights"]:
-                    # Shading Coefficient
-                    shading_coefficient = st.number_input(
-                        "Shading Coefficient (SC)",
-                        min_value=0.0,
-                        max_value=1.0,
-                        value=float(editor_state.get("shading_coefficient", 1.0)),
-                        format="%.2f",
-                        help="Shading coefficient for external or internal shading devices (0.0 to 1.0)."
-                    )
+                # Shading Coefficient
+                shading_coefficient = st.number_input(
+                    "Shading Coefficient (SC)",
+                    min_value=0.0,
+                    max_value=1.0,
+                    value=float(editor_state.get("shading_coefficient", 1.0)),
+                    format="%.2f",
+                    help="Shading coefficient for external or internal shading devices (0.0 to 1.0)."
+                )
             
             # Submit buttons
             col1, col2 = st.columns(2)
@@ -338,6 +275,17 @@ def display_component_tab(comp_type: str):
         
         # Handle form submission
         if submit:
+            # Validate name
+            if not name or name.strip() == "":
+                st.error("Component name is required.")
+                return
+            
+            # Check for unique name
+            existing_names = [comp["name"] for comp in components if not (is_edit and comp["name"] == editor_state.get("name"))]
+            if name in existing_names:
+                st.error("Component name must be unique.")
+                return
+            
             # Create component data
             component_data = {
                 "id": str(uuid.uuid4()),
@@ -345,7 +293,7 @@ def display_component_tab(comp_type: str):
                 "area": area
             }
             
-            if comp_type in ["walls", "windows", "doors", "roofs", "skylights"]:
+            if comp_type in ["walls", "windows", "roofs", "skylights"]:
                 component_data["elevation"] = elevation
                 component_data["rotation"] = rotation
                 component_data["surface_azimuth"] = surface_azimuth
@@ -358,36 +306,25 @@ def display_component_tab(comp_type: str):
                 component_data["construction"] = construction
                 component_data["absorptivity"] = absorptivity
                 component_data["emissivity"] = emissivity
-                component_data["colour"] = colour
                 # Get U-value from construction if available
                 if construction in available_items:
                     component_data["u_value"] = available_items[construction].get("u_value", 0.0)
                 else:
                     component_data["u_value"] = 0.0
-            else:  # Windows, doors, skylights
+            else:  # Windows, skylights
                 component_data["fenestration"] = fenestration
                 component_data["parent_component"] = parent_component
                 # Get U-value and other properties from fenestration if available
                 if fenestration in available_items:
                     component_data["u_value"] = available_items[fenestration].get("u_value", 0.0)
-                    if comp_type == "doors":
-                        component_data["absorptivity"] = absorptivity
-                        component_data["emissivity"] = emissivity
-                        component_data["colour"] = colour
-                    else:
-                        component_data["shgc"] = available_items[fenestration].get("shgc", 0.7)
-                        component_data["visible_transmittance"] = available_items[fenestration].get("visible_transmittance", 0.7)
-                        component_data["shading_coefficient"] = shading_coefficient
+                    component_data["shgc"] = available_items[fenestration].get("shgc", 0.7)
+                    component_data["visible_transmittance"] = available_items[fenestration].get("visible_transmittance", 0.7)
+                    component_data["shading_coefficient"] = shading_coefficient
                 else:
                     component_data["u_value"] = 0.0
-                    if comp_type == "doors":
-                        component_data["absorptivity"] = absorptivity
-                        component_data["emissivity"] = emissivity
-                        component_data["colour"] = colour
-                    else:
-                        component_data["shgc"] = 0.7
-                        component_data["visible_transmittance"] = 0.7
-                        component_data["shading_coefficient"] = shading_coefficient
+                    component_data["shgc"] = 0.7
+                    component_data["visible_transmittance"] = 0.7
+                    component_data["shading_coefficient"] = shading_coefficient
             
             # Handle edit mode
             if is_edit:
@@ -432,8 +369,8 @@ def display_wall_window_table(comp_type: str, components: List[Dict[str, Any]]):
         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):.1f}")
-        cols[4].write(f"{comp.get('tilt', 90.0):.1f}")
+        cols[3].write(f"{comp.get('surface_azimuth', 0.0):.0f}")
+        cols[4].write(f"{comp.get('tilt', 90.0):.0f}")
         if comp_type == "windows":
             cols[5].write(f"{comp.get('shading_coefficient', 1.0):.2f}")
         
@@ -454,9 +391,6 @@ def display_wall_window_table(comp_type: str, components: List[Dict[str, Any]]):
                 
                 if comp_type == "walls":
                     editor_data["construction"] = comp.get("construction", "")
-                    editor_data["absorptivity"] = comp.get("absorptivity", 0.7)
-                    editor_data["emissivity"] = comp.get("emissivity", 0.9)
-                    editor_data["colour"] = comp.get("colour", "Unknown")
                 else:  # windows
                     editor_data["fenestration"] = comp.get("fenestration", "")
                     editor_data["parent_component"] = comp.get("parent_component", "")
@@ -499,8 +433,8 @@ def display_roof_skylight_table(comp_type: str, components: List[Dict[str, Any]]
         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):.1f}")
-        cols[4].write(f"{comp.get('tilt', 0.0):.1f}")
+        cols[3].write(f"{comp.get('surface_azimuth', 0.0):.0f}")
+        cols[4].write(f"{comp.get('tilt', 0.0):.0f}")
         if comp_type == "skylights":
             cols[5].write(f"{comp.get('shading_coefficient', 1.0):.2f}")
         
@@ -521,9 +455,6 @@ 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["absorptivity"] = comp.get("absorptivity", 0.7)
-                    editor_data["emissivity"] = comp.get("emissivity", 0.9)
-                    editor_data["colour"] = comp.get("colour", "Unknown")
                 else:  # skylights
                     editor_data["fenestration"] = comp.get("fenestration", "")
                     editor_data["parent_component"] = comp.get("parent_component", "")
@@ -560,7 +491,7 @@ def display_floor_table(comp_type: str, components: List[Dict[str, Any]]):
         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('contact_with_ground_percentage', 0.0):.1f}")
+        cols[3].write(f"{comp.get('contact_with_ground_percentage', 0.0):.0f}")
         
         # Edit button
         edit_key = f"edit_{comp_type}_{comp['name']}_{idx}"
@@ -572,9 +503,6 @@ def display_floor_table(comp_type: str, components: List[Dict[str, Any]]):
                     "area": comp["area"],
                     "construction": comp.get("construction", ""),
                     "contact_with_ground_percentage": comp.get("contact_with_ground_percentage", 0.0),
-                    "absorptivity": comp.get("absorptivity", 0.7),
-                    "emissivity": comp.get("emissivity", 0.9),
-                    "colour": comp.get("colour", "Unknown"),
                     "is_edit": True
                 }
                 
@@ -591,59 +519,6 @@ def display_floor_table(comp_type: str, components: List[Dict[str, Any]]):
                 st.session_state[f"{comp_type}_action"] = {"action": "delete", "id": str(uuid.uuid4())}
                 st.session_state.components_rerun_pending = True
 
-def display_door_table(comp_type: str, components: List[Dict[str, Any]]):
-    """Display a table of doors with appropriate columns."""
-    # Create column headers
-    cols = st.columns([2, 1, 1, 1, 1, 1, 1, 1])
-    cols[0].write("**Name**")
-    cols[1].write("**U-Value**")
-    cols[2].write("**Absorptivity**")
-    cols[3].write("**Surface Azimuth (°)**")
-    cols[4].write("**Tilt (°)**")
-    cols[5].write("**Edit**")
-    cols[6].write("**Delete**")
-    
-    # Display each component
-    for idx, comp in enumerate(components):
-        cols = st.columns([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.get('absorptivity', 0.7):.2f}")
-        cols[3].write(f"{comp.get('surface_azimuth', 0.0):.1f}")
-        cols[4].write(f"{comp.get('tilt', 90.0):.1f}")
-        
-        # Edit button
-        edit_key = f"edit_{comp_type}_{comp['name']}_{idx}"
-        with cols[5].container():
-            if st.button("Edit", key=edit_key):
-                editor_data = {
-                    "index": idx,
-                    "name": comp["name"],
-                    "area": comp["area"],
-                    "elevation": comp.get("elevation", ORIENTATION_OPTIONS[0]),
-                    "rotation": comp.get("rotation", 0.0),
-                    "tilt": comp.get("tilt", 90.0),
-                    "fenestration": comp.get("fenestration", ""),
-                    "parent_component": comp.get("parent_component", ""),
-                    "absorptivity": comp.get("absorptivity", 0.7),
-                    "emissivity": comp.get("emissivity", 0.9),
-                    "colour": comp.get("colour", "Unknown"),
-                    "is_edit": True
-                }
-                
-                st.session_state[f"{comp_type}_editor"] = editor_data
-                st.session_state[f"{comp_type}_action"] = {"action": "edit", "id": str(uuid.uuid4())}
-                st.session_state.components_rerun_pending = True
-        
-        # Delete button
-        delete_key = f"delete_{comp_type}_{comp['name']}_{idx}"
-        with cols[6].container():
-            if st.button("Delete", key=delete_key):
-                st.session_state.project_data["components"][comp_type].pop(idx)
-                st.success(f"{comp_type[:-1].capitalize()} '{comp['name']}' deleted!")
-                st.session_state[f"{comp_type}_action"] = {"action": "delete", "id": str(uuid.uuid4())}
-                st.session_state.components_rerun_pending = True
-
 def get_available_constructions() -> Dict[str, Any]:
     """
     Get all available constructions from both library and project.
@@ -700,8 +575,8 @@ def get_parent_components(comp_type: str) -> Dict[str, Any]:
     """
     parent_components = {}
     
-    if comp_type == "windows" or comp_type == "doors":
-        # Windows and doors can only be on walls
+    if comp_type == "windows":
+        # Windows can only be on walls
         if "walls" in st.session_state.project_data["components"]:
             for wall in st.session_state.project_data["components"]["walls"]:
                 parent_components[wall["name"]] = wall
@@ -745,23 +620,22 @@ def display_components_help():
     **Key Concepts:**
     
     * **Walls, Roofs, Floors**: Opaque components that use constructions from the Construction section.
-    * **Windows, Doors, Skylights**: Transparent components that use fenestrations from the Material Library section.
+    * **Windows, Skylights**: Transparent components that use fenestrations from the Material Library section.
     * **Surface Azimuth**: Direction the component faces, calculated as elevation plus rotation (0° = North, 90° = East, 180° = South, 270° = West).
     * **Tilt**: Angle of the component relative to horizontal (0° = horizontal, 90° = vertical).
-    * **Parent Component**: The wall or roof that contains a window, door, or skylight.
-    * **Absorptivity/Emissivity**: Thermal properties of the outer surface material.
+    * **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).
     
     **Workflow:**
     
     1. First define opaque components (walls, roofs, floors) using constructions.
-    2. Then define transparent components (windows, doors, skylights) and assign them to parent components.
+    2. Then define transparent components (windows, skylights) and assign them to parent components.
     3. Ensure all major building envelope components are included for accurate load calculations.
     
     **Tips:**
     
     * Use elevation (A, B, C, D) and rotation to set the surface azimuth.
     * For roofs and skylights, set tilt to 0° for flat surfaces.
-    * Ensure the total area of windows and doors doesn't exceed the area of their parent walls.
+    * Ensure the total area of windows doesn't exceed the area of their parent walls.
     * Ensure the total area of skylights doesn't exceed the area of their parent roofs.
     """)