Update app/component_selection.py

app/component_selection.py

@@ -4,6 +4,7 @@ Provides UI for selecting building components in the HVAC Load Calculator.
 All dependencies are included within this file for standalone operation.
 Updated 2025-04-28: Added surface color selection, expanded component types, and skylight support.
 Updated 2025-05-02: Added crack dimensions for walls/doors, drapery properties for windows/skylights, and roof height per enhancement plan.
+Updated 2025-05-03: Removed surface_color field, using solar absorptivity (Light 0.3, Light to Medium 0.45, Medium 0.6, Medium to Dark 0.75, Dark 0.9) exclusively.
 
 Author: Dr Majed Abuseif
 """
@@ -39,11 +40,6 @@ class ComponentType(Enum):
     DOOR = "Door"
     SKYLIGHT = "Skylight"
 
-class SurfaceColor(Enum):
-    DARK = "Dark"
-    MEDIUM = "Medium"
-    LIGHT = "Light"
-
 class GlazingType(Enum):
     SINGLE_CLEAR = "Single Clear"
     SINGLE_TINTED = "Single Tinted"
@@ -104,7 +100,6 @@ class Wall(BuildingComponent):
     absorptivity: float = 0.6
     shading_coefficient: float = 1.0
     infiltration_rate_cfm: float = 0.0
-    surface_color: str = "Dark"  # Added surface color
     crack_length: float = 0.0  # Added for infiltration (m)
     crack_width: float = 0.0   # Added for infiltration (m)
 
@@ -125,17 +120,13 @@ class Wall(BuildingComponent):
         if self.wall_group not in VALID_WALL_GROUPS:
             st.warning(f"Invalid wall_group '{self.wall_group}' for wall '{self.name}'. Defaulting to 'A'.")
             self.wall_group = "A"
-        VALID_SURFACE_COLORS = {"Dark", "Medium", "Light"}
-        if self.surface_color not in VALID_SURFACE_COLORS:
-            st.warning(f"Invalid surface_color '{self.surface_color}' for wall '{self.name}'. Defaulting to 'Dark'.")
-            self.surface_color = "Dark"
 
     def to_dict(self) -> dict:
         base_dict = super().to_dict()
         base_dict.update({
             "wall_type": self.wall_type, "wall_group": self.wall_group, "absorptivity": self.absorptivity,
             "shading_coefficient": self.shading_coefficient, "infiltration_rate_cfm": self.infiltration_rate_cfm,
-            "surface_color": self.surface_color, "crack_length": self.crack_length, "crack_width": self.crack_width
+            "crack_length": self.crack_length, "crack_width": self.crack_width
         })
         return base_dict
 
@@ -145,7 +136,6 @@ class Roof(BuildingComponent):
     roof_group: str = "A"  # ASHRAE group
     slope: str = "Flat"
     absorptivity: float = 0.6
-    surface_color: str = "Dark"  # Added surface color
     roof_height: float = 3.0    # Added for stack effect (m)
 
     def __post_init__(self):
@@ -161,17 +151,12 @@ class Roof(BuildingComponent):
         if self.roof_group not in VALID_ROOF_GROUPS:
             st.warning(f"Invalid roof_group '{self.roof_group}' for roof '{self.name}'. Defaulting to 'A'.")
             self.roof_group = "A"
-        VALID_SURFACE_COLORS = {"Dark", "Medium", "Light"}
-        if self.surface_color not in VALID_SURFACE_COLORS:
-            st.warning(f"Invalid surface_color '{self.surface_color}' for roof '{self.name}'. Defaulting to 'Dark'.")
-            self.surface_color = "Dark"
 
     def to_dict(self) -> dict:
         base_dict = super().to_dict()
         base_dict.update({
             "roof_type": self.roof_type, "roof_group": self.roof_group, "slope": self.slope, 
-            "absorptivity": self.absorptivity, "surface_color": self.surface_color,
-            "roof_height": self.roof_height
+            "absorptivity": self.absorptivity, "roof_height": self.roof_height
         })
         return base_dict
 
@@ -206,13 +191,13 @@ class Window(BuildingComponent):
     shgc: float = 0.7
     shading_device: str = "None"
     shading_coefficient: float = 1.0
-    frame_type: str = "Aluminum without Thermal Break"  # Updated to match FrameType enum
+    frame_type: str = "Aluminum without Thermal Break"
     frame_percentage: float = 20.0
     infiltration_rate_cfm: float = 0.0
-    glazing_type: str = "Double Clear"  # Added glazing type
-    drapery_openness: str = "Open"     # Added for drapery properties
-    drapery_color: str = "Light"       # Added for drapery properties
-    drapery_fullness: float = 1.5      # Added for drapery properties
+    glazing_type: str = "Double Clear"
+    drapery_openness: str = "Open"
+    drapery_color: str = "Light"
+    drapery_fullness: float = 1.5
 
     def __post_init__(self):
         super().__post_init__()
@@ -251,8 +236,8 @@ class Window(BuildingComponent):
 class Door(BuildingComponent):
     door_type: str = "Solid Wood"
     infiltration_rate_cfm: float = 0.0
-    crack_length: float = 0.0  # Added for infiltration (m)
-    crack_width: float = 0.0   # Added for infiltration (m)
+    crack_length: float = 0.0
+    crack_width: float = 0.0
 
     def __post_init__(self):
         super().__post_init__()
@@ -277,13 +262,13 @@ class Skylight(BuildingComponent):
     shgc: float = 0.7
     shading_device: str = "None"
     shading_coefficient: float = 1.0
-    frame_type: str = "Aluminum without Thermal Break"  # Match FrameType enum
+    frame_type: str = "Aluminum without Thermal Break"
     frame_percentage: float = 20.0
     infiltration_rate_cfm: float = 0.0
-    glazing_type: str = "Double Clear"  # Added glazing type
-    drapery_openness: str = "Open"     # Added for drapery properties
-    drapery_color: str = "Light"       # Added for drapery properties
-    drapery_fullness: float = 1.5      # Added for drapery properties
+    glazing_type: str = "Double Clear"
+    drapery_openness: str = "Open"
+    drapery_color: str = "Light"
+    drapery_fullness: float = 1.5
 
     def __post_init__(self):
         super().__post_init__()
@@ -398,11 +383,6 @@ class ReferenceData:
                 "Reflective": {"u_value": 2.4, "shgc": 0.38, "glazing_type": "Reflective", "frame_type": "Aluminum with Thermal Break"},
                 "Custom": {"u_value": 3.0, "shgc": 0.7, "glazing_type": "Double Clear", "frame_type": "Aluminum with Thermal Break"}
             },
-            "surface_colors": {
-                "Dark": 0.9,
-                "Medium": 0.6,
-                "Light": 0.3
-            },
             "frame_types": {
                 "Aluminum without Thermal Break": 1.0,
                 "Aluminum with Thermal Break": 0.8,
@@ -516,11 +496,10 @@ class ComponentSelectionInterface:
                     name = st.text_input("Name", "New Wall")
                     area = st.number_input("Area (m²)", min_value=0.0, value=1.0, step=0.1)
                     orientation = st.selectbox("Orientation", [o.value for o in Orientation if o != Orientation.HORIZONTAL and o != Orientation.NOT_APPLICABLE], index=0)
-                    surface_color = st.selectbox("Surface Color", ["Dark", "Medium", "Light"], index=0)
                     crack_length = st.number_input("Crack Length (m)", min_value=0.0, max_value=100.0, value=0.0, step=0.1)
                 with col2:
                     wall_options = self.reference_data.data["wall_types"]
-                    selected_wall = st.selectbox("Wall Type", options=list(wall_options.keys()))
+                    selected_wall = st seletbox("Wall Type", options=list(wall_options.keys()))
                     u_value = st.number_input("U-Value (W/m²·K)", min_value=0.0, value=float(wall_options[selected_wall]["u_value"]), step=0.01)
                     wall_group = st.selectbox("Wall Group (ASHRAE)", ["A", "B", "C", "D", "E", "F", "G", "H"], index=0)
                     absorptivity = st.selectbox("Solar Absorptivity", ["Light (0.3)", "Light to Medium (0.45)", "Medium (0.6)", "Medium to Dark (0.75)", "Dark (0.9)"], index=2)
@@ -536,7 +515,7 @@ class ComponentSelectionInterface:
                             name=name, u_value=u_value, area=area, orientation=Orientation(orientation),
                             wall_type=selected_wall, wall_group=wall_group, absorptivity=absorptivity_value,
                             shading_coefficient=shading_coefficient, infiltration_rate_cfm=infiltration_rate,
-                            surface_color=surface_color, crack_length=crack_length, crack_width=crack_width
+                            crack_length=crack_length, crack_width=crack_width
                         )
                         self.component_library.add_component(new_wall)
                         session_state.components['walls'].append(new_wall)
@@ -553,12 +532,12 @@ class ComponentSelectionInterface:
             uploaded_file = st.file_uploader("Upload Walls File", type=["csv", "xlsx"], key="wall_upload")
             required_cols = [
                 "Name", "Area (m²)", "U-Value (W/m²·K)", "Orientation", "Wall Type", "Wall Group",
-                "Absorptivity", "Shading Coefficient", "Infiltration Rate (CFM)", "Surface Color",
+                "Absorptivity", "Shading Coefficient", "Infiltration Rate (CFM)",
                 "Crack Length (m)", "Crack Width (m)"
             ]
             template_data = pd.DataFrame(columns=required_cols)
             template_data.loc[0] = [
-                "Example Wall", 10.0, 0.5, "North", "Brick Wall", "A", 0.6, 1.0, 0.0, "Dark", 0.0, 0.0
+                "Example Wall", 10.0, 0.5, "North", "Brick Wall", "A", 0.6, 1.0, 0.0, 0.0, 0.0
             ]
             st.download_button(
                 label="Download Wall Template",
@@ -577,7 +556,7 @@ class ComponentSelectionInterface:
                                 wall_group=str(row["Wall Group"]), absorptivity=float(row["Absorptivity"]),
                                 shading_coefficient=float(row["Shading Coefficient"]),
                                 infiltration_rate_cfm=float(row["Infiltration Rate (CFM)"]),
-                                surface_color=str(row["Surface Color"]), crack_length=float(row["Crack Length (m)"]),
+                                crack_length=float(row["Crack Length (m)"]),
                                 crack_width=float(row["Crack Width (m)"])
                             )
                             self.component_library.add_component(new_wall)
@@ -601,7 +580,6 @@ class ComponentSelectionInterface:
                 with col1:
                     name = st.text_input("Name", "New Roof")
                     area = st.number_input("Area (m²)", min_value=0.0, value=1.0, step=0.1)
-                    surface_color = st.selectbox("Surface Color", ["Dark", "Medium", "Light"], index=0)
                     roof_height = st.number_input("Roof Height (m)", min_value=0.0, max_value=100.0, value=3.0, step=0.1)
                 with col2:
                     roof_options = self.reference_data.data["roof_types"]
@@ -618,8 +596,7 @@ class ComponentSelectionInterface:
                         new_roof = Roof(
                             name=name, u_value=u_value, area=area, orientation=Orientation.HORIZONTAL,
                             roof_type=selected_roof, roof_group=roof_group, slope=slope,
-                            absorptivity=absorptivity_value, surface_color=surface_color,
-                            roof_height=roof_height
+                            absorptivity=absorptivity_value, roof_height=roof_height
                         )
                         self.component_library.add_component(new_roof)
                         session_state.components['roofs'].append(new_roof)
@@ -651,11 +628,11 @@ class ComponentSelectionInterface:
             uploaded_file = st.file_uploader("Upload Roofs File", type=["csv", "xlsx"], key="roof_upload")
             required_cols = [
                 "Name", "Area (m²)", "U-Value (W/m²·K)", "Roof Type", "Roof Group", "Slope",
-                "Absorptivity", "Surface Color", "Roof Height (m)"
+                "Absorptivity", "Roof Height (m)"
             ]
             template_data = pd.DataFrame(columns=required_cols)
             template_data.loc[0] = [
-                "Example Roof", 10.0, 0.3, "Concrete Roof", "A", "Flat", 0.6, "Dark", 3.0
+                "Example Roof", 10.0, 0.3, "Concrete Roof", "A", "Flat", 0.6, 3.0
             ]
             st.download_button(
                 label="Download Roof Template",
@@ -672,8 +649,7 @@ class ComponentSelectionInterface:
                                 name=str(row["Name"]), u_value=float(row["U-Value (W/m²·K)"]), area=float(row["Area (m²)"]),
                                 orientation=Orientation.HORIZONTAL, roof_type=str(row["Roof Type"]),
                                 roof_group=str(row["Roof Group"]), slope=str(row["Slope"]),
-                                absorptivity=float(row["Absorptivity"]), surface_color=str(row["Surface Color"]),
-                                roof_height=float(row["Roof Height (m)"])
+                                absorptivity=float(row["Absorptivity"]), roof_height=float(row["Roof Height (m)"])
                             )
                             self.component_library.add_component(new_roof)
                             session_state.components['roofs'].append(new_roof)
@@ -1092,11 +1068,11 @@ class ComponentSelectionInterface:
             headers = {
                 ComponentType.WALL: [
                     "Name", "Area (m²)", "U-Value (W/m²·K)", "Orientation", "Wall Type", "Wall Group",
-                    "Absorptivity", "Surface Color", "Crack Length (m)", "Crack Width (m)", "Edit", "Delete"
+                    "Absorptivity", "Crack Length (m)", "Crack Width (m)", "Edit", "Delete"
                 ],
                 ComponentType.ROOF: [
                     "Name", "Area (m²)", "U-Value (W/m²·K)", "Roof Type", "Roof Group", "Slope",
-                    "Absorptivity", "Surface Color", "Roof Height (m)", "Edit", "Delete"
+                    "Absorptivity", "Roof Height (m)", "Edit", "Delete"
                 ],
                 ComponentType.FLOOR: [
                     "Name", "Area (m²)", "U-Value (W/m²·K)", "Floor Type", "Ground Contact",
@@ -1130,18 +1106,16 @@ class ComponentSelectionInterface:
                     cols[4].write(comp.wall_type)
                     cols[5].write(comp.wall_group)
                     cols[6].write(comp.absorptivity)
-                    cols[7].write(comp.surface_color)
-                    cols[8].write(comp.crack_length)
-                    cols[9].write(comp.crack_width)
-                    edit_col = 10
+                    cols[7].write(comp.crack_length)
+                    cols[8].write(comp.crack_width)
+                    edit_col = 9
                 elif component_type == ComponentType.ROOF:
                     cols[3].write(comp.roof_type)
                     cols[4].write(comp.roof_group)
                     cols[5].write(comp.slope)
                     cols[6].write(comp.absorptivity)
-                    cols[7].write(comp.surface_color)
-                    cols[8].write(comp.roof_height)
-                    edit_col = 9
+                    cols[7].write(comp.roof_height)
+                    edit_col = 8
                 elif component_type == ComponentType.FLOOR:
                     cols[3].write(comp.floor_type)
                     cols[4].write("Yes" if comp.ground_contact else "No")
@@ -1209,7 +1183,6 @@ class ComponentSelectionInterface:
                 name = st.text_input("Name", wall.name)
                 area = st.number_input("Area (m²)", min_value=0.0, value=wall.area, step=0.1)
                 orientation = st.selectbox("Orientation", [o.value for o in Orientation if o != Orientation.HORIZONTAL and o != Orientation.NOT_APPLICABLE], index=[o.value for o in Orientation if o != Orientation.HORIZONTAL and o != Orientation.NOT_APPLICABLE].index(wall.orientation.value))
-                surface_color = st.selectbox("Surface Color", ["Dark", "Medium", "Light"], index=["Dark", "Medium", "Light"].index(wall.surface_color))
                 crack_length = st.number_input("Crack Length (m)", min_value=0.0, max_value=100.0, value=wall.crack_length, step=0.1)
             with col2:
                 wall_options = self.reference_data.data["wall_types"]
@@ -1221,30 +1194,32 @@ class ComponentSelectionInterface:
                 infiltration_rate = st.number_input("Infiltration Rate (CFM)", min_value=0.0, value=wall.infiltration_rate_cfm, step=0.1)
                 crack_width = st.number_input("Crack Width (m)", min_value=0.0, max_value=0.1, value=wall.crack_width, step=0.001)
 
-            col1, col2 = st.columns([3, 1])
-            with col1:
-                submitted = st.form_submit_button("Update Wall")
-            with col2:
-                if st.form_submit_button("Cancel"):
-                    session_state[f"edit_wall"] = None
-                    st.rerun()
+                col3, col4 = st.columns(2)
+                with col3:
+                    submitted = st.form_submit_button("Update Wall")
+                with col4:
+                    cancelled = st.form_submit_button("Cancel")
 
-            if submitted:
-                try:
-                    absorptivity_value = float(absorptivity.split("(")[1].strip(")"))
-                    updated_wall = Wall(
-                        id=wall.id, name=name, u_value=u_value, area=area, orientation=Orientation(orientation),
-                        wall_type=selected_wall, wall_group=wall_group, absorptivity=absorptivity_value,
-                        shading_coefficient=shading_coefficient, infiltration_rate_cfm=infiltration_rate,
-                        surface_color=surface_color, crack_length=crack_length, crack_width=crack_width
-                    )
-                    self.component_library.components[wall.id] = updated_wall
-                    session_state.components['walls'][index] = updated_wall
-                    st.success(f"Updated {updated_wall.name}")
+                if submitted:
+                    try:
+                        absorptivity_value = float(absorptivity.split("(")[1].strip(")"))
+                        updated_wall = Wall(
+                            id=wall.id, name=name, u_value=u_value, area=area, orientation=Orientation(orientation),
+                            wall_type=selected_wall, wall_group=wall_group, absorptivity=absorptivity_value,
+                            shading_coefficient=shading_coefficient, infiltration_rate_cfm=infiltration_rate,
+                            crack_length=crack_length, crack_width=crack_width
+                        )
+                        self.component_library.components[wall.id] = updated_wall
+                        session_state.components['walls'][index] = updated_wall
+                        st.success(f"Updated {name}")
+                        session_state[f"edit_wall"] = None
+                        st.rerun()
+                    except ValueError as e:
+                        st.error(f"Error: {str(e)}")
+                
+                if cancelled:
                     session_state[f"edit_wall"] = None
                     st.rerun()
-                except ValueError as e:
-                    st.error(f"Error: {str(e)}")
 
     def _display_edit_roof_form(self, session_state: Any, roof: Roof, index: int) -> None:
         with st.form(f"edit_roof_form_{index}", clear_on_submit=True):
@@ -1252,7 +1227,6 @@ class ComponentSelectionInterface:
             with col1:
                 name = st.text_input("Name", roof.name)
                 area = st.number_input("Area (m²)", min_value=0.0, value=roof.area, step=0.1)
-                surface_color = st.selectbox("Surface Color", ["Dark", "Medium", "Light"], index=["Dark", "Medium", "Light"].index(roof.surface_color))
                 roof_height = st.number_input("Roof Height (m)", min_value=0.0, max_value=100.0, value=roof.roof_height, step=0.1)
             with col2:
                 roof_options = self.reference_data.data["roof_types"]
@@ -1262,13 +1236,11 @@ class ComponentSelectionInterface:
                 slope = st.selectbox("Roof Slope", ["Flat", "Low Slope", "Steep Slope"], index=["Flat", "Low Slope", "Steep Slope"].index(roof.slope))
                 absorptivity = st.selectbox("Solar Absorptivity", ["Light (0.3)", "Light to Medium (0.45)", "Medium (0.6)", "Medium to Dark (0.75)", "Dark (0.9)"], index=["Light (0.3)", "Light to Medium (0.45)", "Medium (0.6)", "Medium to Dark (0.75)", "Dark (0.9)"].index(f"{['Light (0.3)', 'Light to Medium (0.45)', 'Medium (0.6)', 'Medium to Dark (0.75)', 'Dark (0.9)'][np.argmin([abs(float(opt.split('(')[1].strip(')')) - roof.absorptivity) for opt in ['Light (0.3)', 'Light to Medium (0.45)', 'Medium (0.6)', 'Medium to Dark (0.75)', 'Dark (0.9)']])]}"))
 
-            col1, col2 = st.columns([3, 1])
-            with col1:
+            col3, col4 = st.columns(2)
+            with col3:
                 submitted = st.form_submit_button("Update Roof")
-            with col2:
-                if st.form_submit_button("Cancel"):
-                    session_state[f"edit_roof"] = None
-                    st.rerun()
+            with col4:
+                cancelled = st.form_submit_button("Cancel")
 
             if submitted:
                 try:
@@ -1276,16 +1248,19 @@ class ComponentSelectionInterface:
                     updated_roof = Roof(
                         id=roof.id, name=name, u_value=u_value, area=area, orientation=Orientation.HORIZONTAL,
                         roof_type=selected_roof, roof_group=roof_group, slope=slope,
-                        absorptivity=absorptivity_value, surface_color=surface_color,
-                        roof_height=roof_height
+                        absorptivity=absorptivity_value, roof_height=roof_height
                     )
                     self.component_library.components[roof.id] = updated_roof
                     session_state.components['roofs'][index] = updated_roof
-                    st.success(f"Updated {updated_roof.name}")
+                    st.success(f"Updated {name}")
                     session_state[f"edit_roof"] = None
                     st.rerun()
                 except ValueError as e:
                     st.error(f"Error: {str(e)}")
+            
+            if cancelled:
+                session_state[f"edit_roof"] = None
+                st.rerun()
 
     def _display_edit_floor_form(self, session_state: Any, floor: Floor, index: int) -> None:
         with st.form(f"edit_floor_form_{index}", clear_on_submit=True):
@@ -1302,13 +1277,11 @@ class ComponentSelectionInterface:
                 ground_temp = st.number_input("Ground Temperature (°C)", min_value=-10.0, max_value=40.0, value=floor.ground_temperature_c, step=0.1) if ground_contact == "Yes" else floor.ground_temperature_c
                 insulated = st.checkbox("Insulated Floor (e.g., R-10)", value=floor.insulated)
 
-            col1, col2 = st.columns([3, 1])
-            with col1:
+            col3, col4 = st.columns(2)
+            with col3:
                 submitted = st.form_submit_button("Update Floor")
-            with col2:
-                if st.form_submit_button("Cancel"):
-                    session_state[f"edit_floor"] = None
-                    st.rerun()
+            with col4:
+                cancelled = st.form_submit_button("Cancel")
 
             if submitted:
                 try:
@@ -1319,11 +1292,15 @@ class ComponentSelectionInterface:
                     )
                     self.component_library.components[floor.id] = updated_floor
                     session_state.components['floors'][index] = updated_floor
-                    st.success(f"Updated {updated_floor.name}")
+                    st.success(f"Updated {name}")
                     session_state[f"edit_floor"] = None
                     st.rerun()
                 except ValueError as e:
                     st.error(f"Error: {str(e)}")
+            
+            if cancelled:
+                session_state[f"edit_floor"] = None
+                st.rerun()
 
     def _display_edit_window_form(self, session_state: Any, window: Window, index: int) -> None:
         with st.form(f"edit_window_form_{index}", clear_on_submit=True):
@@ -1333,7 +1310,7 @@ class ComponentSelectionInterface:
                 area = st.number_input("Area (m²)", min_value=0.0, value=window.area, step=0.1)
                 orientation = st.selectbox("Orientation", [o.value for o in Orientation if o != Orientation.HORIZONTAL and o != Orientation.NOT_APPLICABLE], index=[o.value for o in Orientation if o != Orientation.HORIZONTAL and o != Orientation.NOT_APPLICABLE].index(window.orientation.value))
                 window_options = self.reference_data.data["window_types"]
-                selected_window = st.selectbox("Window Type", options=list(window_options.keys()), index=list(window_options.keys()).index(window.shading_device) if window.shading_device in window_options else 0)
+                selected_window = st.selectbox("Window Type", options=list(window_options.keys()), index=list(window_options.keys()).index(window.glazing_type) if window.glazing_type in window_options else 0)
                 glazing_type = st.selectbox("Glazing Type", [g.value for g in GlazingType], index=[g.value for g in GlazingType].index(window.glazing_type))
                 drapery_openness = st.selectbox("Drapery Openness", [o.value for o in DraperyOpenness], index=[o.value for o in DraperyOpenness].index(window.drapery_openness))
             with col2:
@@ -1343,19 +1320,17 @@ class ComponentSelectionInterface:
                 frame_percentage = st.slider("Frame Percentage (%)", min_value=0.0, max_value=30.0, value=window.frame_percentage)
                 shading_options = {f"{k} (SC={v})": k for k, v in self.reference_data.data["shading_devices"].items()}
                 shading_options["Custom"] = "Custom"
-                shading_device = st.selectbox("Shading Device", options=list(shading_options.keys()), index=list(shading_options.values()).index(window.shading_device) if window.shading_device in shading_options.values() else len(shading_options) - 1)
+                shading_device = st.selectbox("Shading Device", options=list(shading_options.keys()), index=list(shading_options.values()).index(window.shading_device) if window.shading_device in shading_options.values() else 0)
                 shading_coefficient = st.number_input("Custom Shading Coefficient", min_value=0.0, max_value=1.0, value=window.shading_coefficient, step=0.05) if shading_device == "Custom" else self.reference_data.data["shading_devices"][shading_options[shading_device]]
                 infiltration_rate = st.number_input("Infiltration Rate (CFM)", min_value=0.0, value=window.infiltration_rate_cfm, step=0.1)
                 drapery_color = st.selectbox("Drapery Color", [c.value for c in DraperyColor], index=[c.value for c in DraperyColor].index(window.drapery_color))
                 drapery_fullness = st.number_input("Drapery Fullness", min_value=1.0, max_value=2.0, value=window.drapery_fullness, step=0.1)
 
-            col1, col2 = st.columns([3, 1])
-            with col1:
+            col3, col4 = st.columns(2)
+            with col3:
                 submitted = st.form_submit_button("Update Window")
-            with col2:
-                if st.form_submit_button("Cancel"):
-                    session_state[f"edit_window"] = None
-                    st.rerun()
+            with col4:
+                cancelled = st.form_submit_button("Cancel")
 
             if submitted:
                 try:
@@ -1368,11 +1343,15 @@ class ComponentSelectionInterface:
                     )
                     self.component_library.components[window.id] = updated_window
                     session_state.components['windows'][index] = updated_window
-                    st.success(f"Updated {updated_window.name}")
+                    st.success(f"Updated {name}")
                     session_state[f"edit_window"] = None
                     st.rerun()
                 except ValueError as e:
                     st.error(f"Error: {str(e)}")
+            
+            if cancelled:
+                session_state[f"edit_window"] = None
+                st.rerun()
 
     def _display_edit_door_form(self, session_state: Any, door: Door, index: int) -> None:
         with st.form(f"edit_door_form_{index}", clear_on_submit=True):
@@ -1389,13 +1368,11 @@ class ComponentSelectionInterface:
                 infiltration_rate = st.number_input("Infiltration Rate (CFM)", min_value=0.0, value=door.infiltration_rate_cfm, step=0.1)
                 crack_width = st.number_input("Crack Width (m)", min_value=0.0, max_value=0.1, value=door.crack_width, step=0.001)
 
-            col1, col2 = st.columns([3, 1])
-            with col1:
+            col3, col4 = st.columns(2)
+            with col3:
                 submitted = st.form_submit_button("Update Door")
-            with col2:
-                if st.form_submit_button("Cancel"):
-                    session_state[f"edit_door"] = None
-                    st.rerun()
+            with col4:
+                cancelled = st.form_submit_button("Cancel")
 
             if submitted:
                 try:
@@ -1406,11 +1383,15 @@ class ComponentSelectionInterface:
                     )
                     self.component_library.components[door.id] = updated_door
                     session_state.components['doors'][index] = updated_door
-                    st.success(f"Updated {updated_door.name}")
+                    st.success(f"Updated {name}")
                     session_state[f"edit_door"] = None
                     st.rerun()
                 except ValueError as e:
                     st.error(f"Error: {str(e)}")
+            
+            if cancelled:
+                session_state[f"edit_door"] = None
+                st.rerun()
 
     def _display_edit_skylight_form(self, session_state: Any, skylight: Skylight, index: int) -> None:
         with st.form(f"edit_skylight_form_{index}", clear_on_submit=True):
@@ -1419,7 +1400,7 @@ class ComponentSelectionInterface:
                 name = st.text_input("Name", skylight.name)
                 area = st.number_input("Area (m²)", min_value=0.0, value=skylight.area, step=0.1)
                 skylight_options = self.reference_data.data["skylight_types"]
-                selected_skylight = st.selectbox("Skylight Type", options=list(skylight_options.keys()), index=list(skylight_options.keys()).index(skylight.shading_device) if skylight.shading_device in skylight_options else 0)
+                selected_skylight = st.selectbox("Skylight Type", options=list(skylight_options.keys()), index=list(skylight_options.keys()).index(skylight.glazing_type) if skylight.glazing_type in skylight_options else 0)
                 glazing_type = st.selectbox("Glazing Type", [g.value for g in GlazingType], index=[g.value for g in GlazingType].index(skylight.glazing_type))
                 drapery_openness = st.selectbox("Drapery Openness", [o.value for o in DraperyOpenness], index=[o.value for o in DraperyOpenness].index(skylight.drapery_openness))
             with col2:
@@ -1429,19 +1410,17 @@ class ComponentSelectionInterface:
                 frame_percentage = st.slider("Frame Percentage (%)", min_value=0.0, max_value=30.0, value=skylight.frame_percentage)
                 shading_options = {f"{k} (SC={v})": k for k, v in self.reference_data.data["shading_devices"].items()}
                 shading_options["Custom"] = "Custom"
-                shading_device = st.selectbox("Shading Device", options=list(shading_options.keys()), index=list(shading_options.values()).index(skylight.shading_device) if skylight.shading_device in shading_options.values() else len(shading_options) - 1)
+                shading_device = st.selectbox("Shading Device", options=list(shading_options.keys()), index=list(shading_options.values()).index(skylight.shading_device) if skylight.shading_device in shading_options.values() else 0)
                 shading_coefficient = st.number_input("Custom Shading Coefficient", min_value=0.0, max_value=1.0, value=skylight.shading_coefficient, step=0.05) if shading_device == "Custom" else self.reference_data.data["shading_devices"][shading_options[shading_device]]
                 infiltration_rate = st.number_input("Infiltration Rate (CFM)", min_value=0.0, value=skylight.infiltration_rate_cfm, step=0.1)
                 drapery_color = st.selectbox("Drapery Color", [c.value for c in DraperyColor], index=[c.value for c in DraperyColor].index(skylight.drapery_color))
                 drapery_fullness = st.number_input("Drapery Fullness", min_value=1.0, max_value=2.0, value=skylight.drapery_fullness, step=0.1)
 
-            col1, col2 = st.columns([3, 1])
-            with col1:
+            col3, col4 = st.columns(2)
+            with col3:
                 submitted = st.form_submit_button("Update Skylight")
-            with col2:
-                if st.form_submit_button("Cancel"):
-                    session_state[f"edit_skylight"] = None
-                    st.rerun()
+            with col4:
+                cancelled = st.form_submit_button("Cancel")
 
             if submitted:
                 try:
@@ -1454,38 +1433,38 @@ class ComponentSelectionInterface:
                     )
                     self.component_library.components[skylight.id] = updated_skylight
                     session_state.components['skylights'][index] = updated_skylight
-                    st.success(f"Updated {updated_skylight.name}")
+                    st.success(f"Updated {name}")
                     session_state[f"edit_skylight"] = None
                     st.rerun()
                 except ValueError as e:
                     st.error(f"Error: {str(e)}")
+            
+            if cancelled:
+                session_state[f"edit_skylight"] = None
+                st.rerun()
 
     def _save_components(self, session_state: Any) -> None:
         components_data = {
-            "walls": [comp.to_dict() for comp in session_state.components['walls']],
-            "roofs": [comp.to_dict() for comp in session_state.components['roofs']],
-            "floors": [comp.to_dict() for comp in session_state.components['floors']],
-            "windows": [comp.to_dict() for comp in session_state.components['windows']],
-            "doors": [comp.to_dict() for comp in session_state.components['doors']],
-            "skylights": [comp.to_dict() for comp in session_state.components['skylights']],
+            "walls": [comp.to_dict() for comp in session_state.components.get('walls', [])],
+            "roofs": [comp.to_dict() for comp in session_state.components.get('roofs', [])],
+            "floors": [comp.to_dict() for comp in session_state.components.get('floors', [])],
+            "windows": [comp.to_dict() for comp in session_state.components.get('windows', [])],
+            "doors": [comp.to_dict() for comp in session_state.components.get('doors', [])],
+            "skylights": [comp.to_dict() for comp in session_state.components.get('skylights', [])],
             "roof_air_volume_m3": session_state.roof_air_volume_m3,
             "roof_ventilation_ach": session_state.roof_ventilation_ach
         }
-        buffer = io.StringIO()
-        json.dump(components_data, buffer, indent=2)
+        output = io.StringIO()
+        json.dump(components_data, output, indent=4)
         st.download_button(
             label="Download Components JSON",
-            data=buffer.getvalue(),
+            data=output.getvalue(),
             file_name="components.json",
             mime="application/json"
         )
-        st.success("Components saved! Download the JSON file.")
-
-# --- Main Application ---
-def main():
-    st.set_page_config(page_title="HVAC Component Selection", layout="wide")
-    component_selection = ComponentSelectionInterface()
-    component_selection.display_component_selection(st.session_state)
+        st.success("Components saved! Click the button to download the JSON file.")
 
+# --- Main Execution ---
 if __name__ == "__main__":
-    main()
+    interface = ComponentSelectionInterface()
+    interface.display_component_selection(st.session_state)