Update app/main.py

app/main.py

@@ -116,7 +116,14 @@ class HVACCalculator:
         self.data_export = DataExport()
         self.cooling_calculator = CoolingLoadCalculator()
         self.heating_calculator = HeatingLoadCalculator()
-        self.drapery = Drapery()
+        # Initialize Drapery with UI inputs from session state
+        self.drapery = Drapery(
+            openness=st.session_state.get('drapery_openness', 'Semi-Open'),
+            color=st.session_state.get('drapery_color', 'Medium'),
+            fullness=st.session_state.get('drapery_fullness', 1.5),
+            enabled=st.session_state.get('drapery_enabled', True),
+            shading_device=st.session_state.get('shading_device', 'Drapes')
+        )
         
         # Persist ClimateData in session_state
         if 'climate_data_obj' not in st.session_state:
@@ -898,11 +905,16 @@ class HVACCalculator:
                     return False, f"Error in roof CLTD calculation: {str(e)}", {}
             
             for window in building_components.get('windows', []):
-                adjusted_shgc = self.drapery.adjust_shgc(
-                    base_shgc=window.shgc,
-                    glazing_type=window.glazing_type,
-                    drapery_type=window.drapery_type if hasattr(window, 'drapery_type') else None
-                )
+                adjusted_shgc = window.shgc  # Default to base SHGC
+                if hasattr(window, 'drapery_type') and window.drapery_type and self.drapery.enabled:
+                    try:
+                        adjusted_shgc = self.drapery.get_shading_coefficient(window.shgc)
+                        if st.session_state.get('debug_mode', False):
+                            st.write(f"Debug: Window {window.name} adjusted SHGC: {adjusted_shgc}")
+                    except Exception as e:
+                        if st.session_state.get('debug_mode', False):
+                            st.error(f"Error adjusting SHGC for window {window.name}: {str(e)}")
+                        adjusted_shgc = window.shgc
                 load_dict = self.cooling_calculator.calculate_window_cooling_load(
                     window=window,
                     outdoor_temp=outdoor_conditions['temperature'],
@@ -958,11 +970,16 @@ class HVACCalculator:
                 })
             
             for skylight in building_components.get('skylights', []):
-                adjusted_shgc = self.drapery.adjust_shgc(
-                    base_shgc=skylight.shgc,
-                    glazing_type=skylight.glazing_type,
-                    drapery_type=skylight.drapery_type if hasattr(skylight, 'drapery_type') else None
-                )
+                adjusted_shgc = skylight.shgc  # Default to base SHGC
+                if hasattr(skylight, 'drapery_type') and skylight.drapery_type and self.drapery.enabled:
+                    try:
+                        adjusted_shgc = self.drapery.get_shading_coefficient(skylight.shgc)
+                        if st.session_state.get('debug_mode', False):
+                            st.write(f"Debug: Skylight {skylight.name} adjusted SHGC: {adjusted_shgc}")
+                    except Exception as e:
+                        if st.session_state.get('debug_mode', False):
+                            st.error(f"Error adjusting SHGC for skylight {skylight.name}: {str(e)}")
+                        adjusted_shgc = skylight.shgc
                 load_dict = self.cooling_calculator.calculate_skylight_cooling_load(
                     skylight=skylight,
                     outdoor_temp=outdoor_conditions['temperature'],
@@ -1289,7 +1306,7 @@ class HVACCalculator:
                     'name': roof.name,
                     'orientation': roof.orientation.value,
                     'area': roof.area,
-                    'u_value': roof.u_value,
+                    'u_value': wall.u_value,
                     'solar_absorptivity': roof.solar_absorptivity,
                     'delta_t': delta_t,
                     'load': load / 1000
@@ -1318,7 +1335,7 @@ class HVACCalculator:
                 )
                 results['detailed_loads']['windows'].append({
                     'name': window.name,
-                    'orientation': window.orientation.value,
+                    'orientation': wall.orientation.value,
                     'area': window.area,
                     'u_value': window.u_value,
                     'glazing_type': window.glazing_type,