Update app.py

app.py

@@ -121,26 +121,35 @@ def create_plot(df, chart_type, x_column, y_column, group_column=None, size_colu
         
         elif chart_type == "堆疊長條圖":
             if group_column and group_column in df.columns:
-                grouped_df = df.pivot_table(index=x_column, columns=group_column, 
-                                           values=y_column, aggfunc=agg_func).reset_index()
-                grouped_df = grouped_df.fillna(0)
+                # 明確將字符串列轉換為類別型
+                df[x_column] = df[x_column].astype('category')
+                df[group_column] = df[group_column].astype('category')
                 
-                # 取得所有類別
-                categories = grouped_df.columns.tolist()
+                # 先進行計數統計
+                count_df = df.groupby([x_column, group_column]).size().reset_index(name='count')
+                
+                # 創建樞紐表
+                pivot_df = count_df.pivot_table(index=x_column, columns=group_column, 
+                                               values='count', aggfunc='sum').reset_index()
+                pivot_df = pivot_df.fillna(0)
+                
+                # 獲取所有情緒類別
+                categories = pivot_df.columns.tolist()
                 categories.remove(x_column)
                 
+                # 創建圖表
                 for i, category in enumerate(categories):
                     color = colors[i % len(colors)]
-                    if category in custom_colors:
-                        color = custom_colors[category]
+                    if str(category) in custom_colors:
+                        color = custom_colors[str(category)]
                         
                     pattern_shape = None
                     if patterns and i < len(patterns) and patterns[i] != "無":
                         pattern_shape = patterns[i]
                         
                     fig.add_trace(go.Bar(
-                        x=grouped_df[x_column],
-                        y=grouped_df[category],
+                        x=pivot_df[x_column],
+                        y=pivot_df[category],
                         name=str(category),
                         marker_color=color,
                         marker_pattern_shape=pattern_shape
@@ -148,9 +157,10 @@ def create_plot(df, chart_type, x_column, y_column, group_column=None, size_colu
                 
                 fig.update_layout(barmode='stack')
             else:
-                grouped_df = df.groupby(x_column)[y_column].agg(agg_func).reset_index()
-                fig = px.bar(grouped_df, x=x_column, y=y_column, **fig_params)
-        
+                # 簡單計數
+                counts = df[x_column].value_counts().reset_index()
+                counts.columns = [x_column, 'count']
+                fig = px.bar(counts, x=x_column, y='count', **fig_params)        
         
         elif chart_type == "群組長條圖":
             if group_column and group_column in df.columns: