Update app.py

app.py

@@ -1,18 +1,17 @@
 import streamlit as st
 import pandas as pd
 import plotly.graph_objects as go
-import numpy as np
 
 def load_data(uploaded_file):
     """載入並處理CSV檔案"""
     try:
-        # 跳過前兩行
-        df = pd.read_csv(uploaded_file, encoding='utf-8', skiprows=2)
+        # 直接載入檔案
+        df = pd.read_csv(uploaded_file, encoding='utf-8')
         
         # 移除空白列
         df = df.dropna(how='all')
-        
-        # 將數值欄位轉換為numeric
+
+        # 將數值欄位轉換為數字類型
         numeric_columns = ['平均', '總分', '國文', '英文', '數學', '自科', '社會', '地理', '歷史', '公民']
         for col in numeric_columns:
             df[col] = pd.to_numeric(df[col], errors='coerce')
@@ -24,101 +23,62 @@ def load_data(uploaded_file):
 
 def create_radar_chart(df, selected_rows, selected_columns):
     """使用Plotly建立雷達圖"""
-    # 定義不同線段樣式
     line_styles = ['solid', 'dot', 'dash', 'longdash', 'dashdot']
-    
-    # 定義顏色調色盤
     colors = ['#1F77B4', '#FF7F0E', '#2CA02C', '#D62728', '#9467BD']
     
     fig = go.Figure()
 
-    # 依次加入選取的列
     for i, row_name in enumerate(selected_rows):
-        # 找出符合名稱的資料列
-        if '班平均' in row_name or '區標' in row_name:
-            row_data = df[df['姓名'].str.contains(row_name)][selected_columns].iloc[0]
-        else:
-            row_data = df[df['姓名'] == row_name][selected_columns].iloc[0]
-        
+        row_data = df[df['姓名'] == row_name][selected_columns].iloc[0]
+
         fig.add_trace(go.Scatterpolar(
-            r = row_data.values,
-            theta = selected_columns,
-            fill = 'toself',
-            name = row_name,
-            line = dict(
-                color = colors[i % len(colors)], 
-                dash = line_styles[i % len(line_styles)],
-                width = 2
-            ),
-            marker = dict(symbol='circle')
+            r=row_data.values,
+            theta=selected_columns,
+            fill='toself',
+            name=row_name,
+            line=dict(
+                color=colors[i % len(colors)],
+                dash=line_styles[i % len(line_styles)],
+                width=2
+            )
         ))
 
     fig.update_layout(
-        polar = dict(
-            radialaxis = dict(
-                visible = True,
-                range = [0, df[selected_columns].values.max() * 1.1]
+        polar=dict(
+            radialaxis=dict(
+                visible=True,
+                range=[0, df[selected_columns].values.max() * 1.1]
             )
         ),
-        showlegend = True,
-        title = '學生成績雷達圖'
+        showlegend=True,
+        title='學生成績雷達圖'
     )
-    
+
     return fig
 
 def main():
     st.title('學生成績雷達圖產生器')
-    
-    # 上傳CSV檔案
+
     uploaded_file = st.file_uploader("上傳CSV檔案", type=['csv'])
-    
+
     if uploaded_file is not None:
         df = load_data(uploaded_file)
-        
+
         if df is not None:
-            # 定義固定的數值欄位
             numeric_columns = ['平均', '總分', '國文', '英文', '數學', '自科', '社會', '地理', '歷史', '公民']
-            
-            # 篩選出數值欄位
-            available_columns = [col for col in numeric_columns if col in df.columns]
-            
-            # 準備行選擇選項
-            # 學生名稱 + 班級平均 + 區域均標
-            row_options = list(df['姓名'].dropna()) + [row for row in df['姓名'] if '班平均' in str(row) or '區標' in str(row)]
-            
+
             st.write("### 選擇要比較的欄位")
-            # 創建選擇介面
-            selected_columns = []
-            for column in available_columns:
-                if st.checkbox(column, key=column):
-                    selected_columns.append(column)
-            
+            selected_columns = [col for col in numeric_columns if st.checkbox(col, key=col)]
+
             st.write("### 選擇要比較的對象")
-            # 創建列選擇介面
-            selected_rows = st.multiselect(
-                '選擇要比較的對象', 
-                row_options
-            )
-            
+            selected_rows = st.multiselect('選擇要比較的對象', df['姓名'].tolist())
+
             if selected_columns and selected_rows:
                 try:
-                    # 建立雷達圖
                     fig = create_radar_chart(df, selected_rows, selected_columns)
-                    
-                    # 顯示圖表
                     st.plotly_chart(fig, use_container_width=True)
-                    
-                    # 下載圖表
-                    fig_bytes = fig.to_image(format="png", width=1200, height=800)
-                    st.download_button(
-                        label="下載雷達圖",
-                        data=fig_bytes,
-                        file_name="student_scores_radar_chart.png",
-                        mime="image/png"
-                    )
-                
                 except Exception as e:
                     st.error(f"生成雷達圖時發生錯誤：{e}")
 
 if __name__ == "__main__":
-    main()
+    main()