Update app/components.py

app/components.py

@@ -293,6 +293,15 @@ def display_component_tab(comp_type: str):
                     help="Shading coefficient for external or internal shading devices (0.0 to 1.0)."
                 )
                 
+                # Shading Type
+                shading_type_options = ["No Shading", "Internal Shading", "External Shading"]
+                shading_type = st.selectbox(
+                    "Shading Type",
+                    shading_type_options,
+                    index=shading_type_options.index(editor_state.get("shading_type", "No Shading")) if editor_state.get("shading_type") in shading_type_options else 0,
+                    help="Select the type of shading for this fenestration."
+                )
+                
                 # Function Type (Operable/Fixed)
                 function_type_options = ["Operable", "Fixed"]
                 function_type = st.selectbox(
@@ -363,6 +372,7 @@ def display_component_tab(comp_type: str):
                 component_data["parent_component"] = parent_component
                 component_data["function_type"] = function_type
                 component_data["shading_coefficient"] = shading_coefficient
+                component_data["shading_type"] = shading_type
                 # Fix: Handle both GlazingMaterial and dictionary for fenestration_data
                 if fenestration in available_items:
                     fenestration_data = available_items[fenestration]
@@ -406,7 +416,7 @@ def display_component_tab(comp_type: str):
 def display_wall_window_table(comp_type: str, components: List[Dict[str, Any]]):
     """Display a table of walls or windows with appropriate columns."""
     # Create column headers
-    cols = st.columns([2, 1, 1, 1, 1, 1, 1, 1, 1] if comp_type == "walls" else [2, 1, 1, 1, 1, 1, 1, 1])
+    cols = st.columns([2, 1, 1, 1, 1, 1, 1, 1, 1, 1] if comp_type == "walls" else [2, 1, 1, 1, 1, 1, 1, 1, 1])
     cols[0].write("**Name**")
     cols[1].write("**U-Value**")
     cols[2].write("**Area (m²)**")
@@ -419,12 +429,13 @@ def display_wall_window_table(comp_type: str, components: List[Dict[str, Any]]):
         cols[8].write("**Delete**")
     else:  # windows
         cols[5].write("**SC**")
-        cols[6].write("**Edit**")
-        cols[7].write("**Delete**")
+        cols[6].write("**Shading Type**")
+        cols[7].write("**Edit**")
+        cols[8].write("**Delete**")
     
     # Display each component
     for idx, comp in enumerate(components):
-        cols = st.columns([2, 1, 1, 1, 1, 1, 1, 1, 1] if comp_type == "walls" else [2, 1, 1, 1, 1, 1, 1, 1])
+        cols = st.columns([2, 1, 1, 1, 1, 1, 1, 1, 1] if comp_type == "walls" else [2, 1, 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}")
@@ -433,10 +444,13 @@ def display_wall_window_table(comp_type: str, components: List[Dict[str, Any]]):
         if comp_type == "walls":
             cols[5].write("Yes" if comp.get("adiabatic", False) else "No")
             cols[6].write("Yes" if comp.get("ground_contact", False) else "No")
+        else:  # windows
+            cols[5].write(f"{comp.get('shading_coefficient', 1.0):.2f}")
+            cols[6].write(comp.get("shading_type", "No Shading"))
         
         # Edit button
         edit_key = f"edit_{comp_type}_{comp['name']}_{idx}"
-        edit_col = 7 if comp_type == "walls" else 6
+        edit_col = 7 if comp_type == "walls" else 7
         with cols[edit_col].container():
             if st.button("Edit", key=edit_key):
                 editor_data = {
@@ -457,6 +471,7 @@ def display_wall_window_table(comp_type: str, components: List[Dict[str, Any]]):
                     editor_data["fenestration"] = comp.get("fenestration", "")
                     editor_data["parent_component"] = comp.get("parent_component", "")
                     editor_data["shading_coefficient"] = comp.get("shading_coefficient", 1.0)
+                    editor_data["shading_type"] = comp.get("shading_type", "No Shading")
                     editor_data["function_type"] = comp.get("function_type", "Fixed")
                 
                 st.session_state[f"{comp_type}_editor"] = editor_data
@@ -465,7 +480,7 @@ def display_wall_window_table(comp_type: str, components: List[Dict[str, Any]]):
         
         # Delete button
         delete_key = f"delete_{comp_type}_{comp['name']}_{idx}"
-        delete_col = 8 if comp_type == "walls" else 7
+        delete_col = 8 if comp_type == "walls" else 8
         with cols[delete_col].container():
             if st.button("Delete", key=delete_key):
                 st.session_state.project_data["components"][comp_type].pop(idx)
@@ -476,7 +491,7 @@ 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, 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, 1] if comp_type == "roofs" else [2, 1, 1, 1, 1, 1, 1, 1, 1])
     cols[0].write("**Name**")
     cols[1].write("**U-Value**")
     cols[2].write("**Area (m²)**")
@@ -489,12 +504,13 @@ def display_roof_skylight_table(comp_type: str, components: List[Dict[str, Any]]
         cols[8].write("**Delete**")
     else:  # skylights
         cols[5].write("**SC**")
-        cols[6].write("**Edit**")
-        cols[7].write("**Delete**")
+        cols[6].write("**Shading Type**")
+        cols[7].write("**Edit**")
+        cols[8].write("**Delete**")
     
     # Display each component
     for idx, comp in enumerate(components):
-        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 = st.columns([2, 1, 1, 1, 1, 1, 1, 1, 1] if comp_type == "roofs" else [2, 1, 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}")
@@ -505,10 +521,11 @@ def display_roof_skylight_table(comp_type: str, components: List[Dict[str, Any]]
             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}")
+            cols[6].write(comp.get("shading_type", "No Shading"))
         
         # Edit button
         edit_key = f"edit_{comp_type}_{comp['name']}_{idx}"
-        edit_col = 7 if comp_type == "roofs" else 6
+        edit_col = 7 if comp_type == "roofs" else 7
         with cols[edit_col].container():
             if st.button("Edit", key=edit_key):
                 editor_data = {
@@ -529,6 +546,7 @@ def display_roof_skylight_table(comp_type: str, components: List[Dict[str, Any]]
                     editor_data["fenestration"] = comp.get("fenestration", "")
                     editor_data["parent_component"] = comp.get("parent_component", "")
                     editor_data["shading_coefficient"] = comp.get("shading_coefficient", 1.0)
+                    editor_data["shading_type"] = comp.get("shading_type", "No Shading")
                     editor_data["function_type"] = comp.get("function_type", "Fixed")
                 
                 st.session_state[f"{comp_type}_editor"] = editor_data
@@ -537,7 +555,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 = 8 if comp_type == "roofs" else 7
+        delete_col = 8 if comp_type == "roofs" else 8
         with cols[delete_col].container():
             if st.button("Delete", key=delete_key):
                 st.session_state.project_data["components"][comp_type].pop(idx)
@@ -699,6 +717,7 @@ 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).
+    * **Shading Type**: Type of shading for windows/skylights (No Shading, Internal Shading, External Shading).
     * **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).
     
@@ -716,4 +735,5 @@ def display_components_help():
     * Ensure the total area of skylights doesn't exceed the area of their parent roofs.
     * Set adiabatic to 'Yes' for components with no heat transfer, such as internal partitions.
     * Set ground contact to 'Yes' for components in direct contact with the ground for accurate heat transfer calculations.
+    * Specify shading type for windows and skylights to account for different shading effects.
     """)