Update app/main.py

app/main.py

@@ -1,13 +1,5 @@
 """
 HVAC Calculator Code Documentation
-
-This module contains the main Streamlit application for the HVAC Calculator.
-It provides a comprehensive interface for calculating heating and cooling loads
-using ASHRAE methods.
-
-Author: Dr Majed Abuseif
-Date: March 2025
-Version: 1.0.0
 """
 
 import streamlit as st
@@ -24,20 +16,18 @@ from typing import Dict, List, Any, Optional, Tuple
 
 # Import application modules
 from app.building_info_form import BuildingInfoForm
-from app.component_selection import ComponentSelectionInterface
+from app.hvac_component_selection import ComponentSelectionInterface, Orientation, ComponentType, Wall, Roof, Floor, Window, Door
 from app.results_display import ResultsDisplay
 from app.data_validation import DataValidation
 from app.data_persistence import DataPersistence
 from app.data_export import DataExport
 
-# Import data modules
-from data.building_components import Wall, Roof, Floor, Window, Door, Orientation, ComponentType
+# Import data modules (adjusted to avoid building_components)
 from data.reference_data import ReferenceData
 from data.climate_data import ClimateData
 from data.ashrae_tables import ASHRAETables
 
 # Import utility modules
-from utils.component_library import ComponentLibrary
 from utils.u_value_calculator import UValueCalculator
 from utils.shading_system import ShadingSystem
 from utils.area_calculation_system import AreaCalculationSystem
@@ -50,26 +40,8 @@ from utils.scenario_comparison import ScenarioComparisonVisualization
 from utils.psychrometric_visualization import PsychrometricVisualization
 from utils.time_based_visualization import TimeBasedVisualization
 
-
 class HVACCalculator:
-    """
-    Main HVAC Calculator application class.
-    
-    This class initializes the Streamlit application and manages the navigation
-    between different sections of the calculator.
-    
-    Attributes:
-        building_info_form (BuildingInfoForm): Building information input form
-        component_selection (ComponentSelection): Component selection interface
-        results_display (ResultsDisplay): Results display module
-        data_validation (DataValidation): Data validation module
-        data_persistence (DataPersistence): Data persistence module
-        data_export (DataExport): Data export module
-    """
-    
     def __init__(self):
-        """Initialize the HVAC Calculator application."""
-        # Set page configuration
         st.set_page_config(
             page_title="HVAC Load Calculator",
             page_icon="🌡️",
@@ -77,7 +49,6 @@ class HVACCalculator:
             initial_sidebar_state="expanded"
         )
         
-        # Initialize session state if not exists
         if 'page' not in st.session_state:
             st.session_state.page = 'Building Information'
         
@@ -112,7 +83,6 @@ class HVACCalculator:
         if 'climate_data' not in st.session_state:
             st.session_state.climate_data = {}
         
-        # Initialize application modules
         self.building_info_form = BuildingInfoForm()
         self.component_selection = ComponentSelectionInterface()
         self.results_display = ResultsDisplay()
@@ -120,16 +90,12 @@ class HVACCalculator:
         self.data_persistence = DataPersistence()
         self.data_export = DataExport()
         
-        # Set up the application layout
         self.setup_layout()
     
     def setup_layout(self):
-        """Set up the application layout with sidebar navigation."""
-        # Application title
         st.sidebar.title("HVAC Load Calculator")
         st.sidebar.markdown("---")
         
-        # Navigation
         st.sidebar.subheader("Navigation")
         pages = [
             "Building Information",
@@ -142,14 +108,11 @@ class HVACCalculator:
         
         selected_page = st.sidebar.radio("Go to", pages, index=pages.index(st.session_state.page))
         
-        # Update session state if page changed
         if selected_page != st.session_state.page:
             st.session_state.page = selected_page
         
-        # Display the selected page
         self.display_page(st.session_state.page)
         
-        # Footer
         st.sidebar.markdown("---")
         st.sidebar.info(
             "HVAC Load Calculator v1.0.0\n\n"
@@ -161,12 +124,6 @@ class HVACCalculator:
         )
     
     def display_page(self, page: str):
-        """
-        Display the selected page.
-        
-        Args:
-            page (str): The page to display
-        """
         if page == "Building Information":
             self.building_info_form.display_building_info_form(st.session_state)
         elif page == "Climate Data":
@@ -181,58 +138,45 @@ class HVACCalculator:
             self.data_export.display()
     
     def display_climate_data(self):
-        """Display the climate data page."""
         climate_data = ClimateData()
         climate_data.display_climate_input(st.session_state)
         
-        # Store climate data in session state if locations are added
         if climate_data.locations:
             st.session_state["climate_data"] = climate_data.locations
     
     def display_internal_loads(self):
-        """Display the internal loads page."""
         st.title("Internal Loads")
         
-        # Check if building components are available
         if not any(st.session_state.components.values()):
             st.warning("Please define building components first.")
             st.button("Go to Building Components", on_click=self.navigate_to, args=["Building Components"])
             return
         
-        # Tabs for different internal load types
         tabs = st.tabs(["People", "Lighting", "Equipment"])
         
-        # People tab
         with tabs[0]:
             self.display_people_loads()
         
-        # Lighting tab
         with tabs[1]:
             self.display_lighting_loads()
         
-        # Equipment tab
         with tabs[2]:
             self.display_equipment_loads()
         
-        # Display summary of internal loads
         self.display_internal_loads_summary()
         
-        # Navigation buttons
         col1, col2 = st.columns(2)
         with col1:
             st.button("Back to Building Components", on_click=self.navigate_to, args=["Building Components"])
         with col2:
-            # Validate internal loads before proceeding
             if self.data_validation.validate_internal_loads():
                 st.button("Continue to Calculation Results", on_click=self.navigate_to, args=["Calculation Results"])
             else:
                 st.button("Continue to Calculation Results", disabled=True)
     
     def display_people_loads(self):
-        """Display the people loads section."""
         st.subheader("People")
         
-        # Form for adding people loads
         with st.form("people_load_form"):
             col1, col2 = st.columns(2)
             
@@ -255,7 +199,6 @@ class HVACCalculator:
             submitted = st.form_submit_button("Add People Load")
             
             if submitted:
-                # Create people load
                 people_load = {
                     "id": f"people_{len(st.session_state.internal_loads['people'])}",
                     "name": name,
@@ -265,11 +208,9 @@ class HVACCalculator:
                     "hours_in_operation": hours_in_operation
                 }
                 
-                # Add to session state
                 st.session_state.internal_loads['people'].append(people_load)
                 st.success(f"Added {name} with {num_people} people")
         
-        # Display existing people loads
         if st.session_state.internal_loads['people']:
             st.subheader("Existing People Loads")
             
@@ -286,7 +227,6 @@ class HVACCalculator:
             
             df = pd.DataFrame(people_data)
             
-            # Display table with edit and delete buttons
             for i, row in df.iterrows():
                 col1, col2, col3, col4, col5, col6, col7 = st.columns([2, 1, 2, 2, 1, 1, 1])
                 
@@ -312,10 +252,8 @@ class HVACCalculator:
                         st.experimental_rerun()
     
     def display_lighting_loads(self):
-        """Display the lighting loads section."""
         st.subheader("Lighting")
         
-        # Form for adding lighting loads
         with st.form("lighting_load_form"):
             col1, col2 = st.columns(2)
             
@@ -335,7 +273,6 @@ class HVACCalculator:
             submitted = st.form_submit_button("Add Lighting Load")
             
             if submitted:
-                # Create lighting load
                 lighting_load = {
                     "id": f"lighting_{len(st.session_state.internal_loads['lighting'])}",
                     "name": name,
@@ -345,11 +282,9 @@ class HVACCalculator:
                     "hours_in_operation": hours_in_operation
                 }
                 
-                # Add to session state
                 st.session_state.internal_loads['lighting'].append(lighting_load)
                 st.success(f"Added {name} with {power} W")
         
-        # Display existing lighting loads
         if st.session_state.internal_loads['lighting']:
             st.subheader("Existing Lighting Loads")
             
@@ -366,7 +301,6 @@ class HVACCalculator:
             
             df = pd.DataFrame(lighting_data)
             
-            # Display table with edit and delete buttons
             for i, row in df.iterrows():
                 col1, col2, col3, col4, col5, col6, col7 = st.columns([2, 1, 1, 2, 1, 1, 1])
                 
@@ -392,10 +326,8 @@ class HVACCalculator:
                         st.experimental_rerun()
     
     def display_equipment_loads(self):
-        """Display the equipment loads section."""
         st.subheader("Equipment")
         
-        # Form for adding equipment loads
         with st.form("equipment_load_form"):
             col1, col2 = st.columns(2)
             
@@ -417,7 +349,6 @@ class HVACCalculator:
             submitted = st.form_submit_button("Add Equipment Load")
             
             if submitted:
-                # Create equipment load
                 equipment_load = {
                     "id": f"equipment_{len(st.session_state.internal_loads['equipment'])}",
                     "name": name,
@@ -428,11 +359,9 @@ class HVACCalculator:
                     "hours_in_operation": hours_in_operation
                 }
                 
-                # Add to session state
                 st.session_state.internal_loads['equipment'].append(equipment_load)
                 st.success(f"Added {name} with {power} W")
         
-        # Display existing equipment loads
         if st.session_state.internal_loads['equipment']:
             st.subheader("Existing Equipment Loads")
             
@@ -450,7 +379,6 @@ class HVACCalculator:
             
             df = pd.DataFrame(equipment_data)
             
-            # Display table with edit and delete buttons
             for i, row in df.iterrows():
                 col1, col2, col3, col4, col5, col6, col7, col8 = st.columns([2, 1, 1, 1, 2, 1, 1, 1])
                 
@@ -478,20 +406,16 @@ class HVACCalculator:
                         st.experimental_rerun()
     
     def display_internal_loads_summary(self):
-        """Display a summary of all internal loads."""
         st.subheader("Internal Loads Summary")
         
-        # Check if any internal loads exist
         if not any(st.session_state.internal_loads.values()):
             st.info("No internal loads defined yet.")
             return
         
-        # Calculate total loads
         total_people = sum(load['num_people'] for load in st.session_state.internal_loads['people'])
         total_lighting_power = sum(load['power'] * load['usage_factor'] for load in st.session_state.internal_loads['lighting'])
         total_equipment_power = sum(load['power'] * load['usage_factor'] for load in st.session_state.internal_loads['equipment'])
         
-        # Display summary
         col1, col2, col3 = st.columns(3)
         
         with col1:
@@ -503,31 +427,18 @@ class HVACCalculator:
         with col3:
             st.metric("Total Equipment Power", f"{total_equipment_power:.1f} W")
         
-        # Display pie chart of internal loads
         if total_lighting_power > 0 or total_equipment_power > 0:
-            # Estimate people load (assuming 100W per person)
             people_power = total_people * 100
-            
-            # Create pie chart
             fig = px.pie(
                 values=[people_power, total_lighting_power, total_equipment_power],
                 names=['People', 'Lighting', 'Equipment'],
                 title='Internal Loads Distribution'
             )
-            
             st.plotly_chart(fig, use_container_width=True)
     
     def navigate_to(self, page: str):
-        """
-        Navigate to the specified page.
-        
-        Args:
-            page (str): The page to navigate to
-        """
         st.session_state.page = page
         st.experimental_rerun()
 
-
 if __name__ == "__main__":
-    # Create and run the HVAC Calculator application
     app = HVACCalculator()