modify image process

app.py

@@ -48,7 +48,7 @@ if file_name is not None:
         
         # Calculate the number of rows needed for 3 columns
         num_images = len(persons)
-        num_cols = 3
+        num_cols = 8
         num_rows = (num_images + num_cols - 1) // num_cols  # Ceiling division
 
         # Create a new canvas to stitch all person images in a grid with 3 columns
@@ -107,19 +107,45 @@ if file_name is not None:
         labels = list(label_counts.keys())
         sizes = list(label_counts.values())
         
-        pie_fig, ax = plt.subplots()
-        ax.pie(sizes, labels=labels, autopct='%1.1f%%', startangle=140)
-        ax.set_title('Distribution of Emotions')
-        ax.axis('equal')  # 确保饼状图为圆形
+        pie_fig, pie_ax = plt.subplots()
+        pie_ax.pie(sizes, labels=labels, autopct='%1.1f%%', startangle=140)
+        pie_ax.set_title('Distribution of Emotions')
+        pie_ax.axis('equal')  # 确保饼状图为圆形
+
+
+        labels_refined = [item['label'] for item in output_list_emotions_refined]
+        label_counts_refined = {label: labels_refined.count(label) for label in set(labels_refined)}
+
+        bar_fig, bar_ax = plt.subplots()
+        bar_ax.bar(label_counts_refined.keys(), label_counts_refined.values())
+        bar_ax.set_title('Distribution of Emotions')
+        bar_ax.set_xlabel('Emotions')
+        bar_ax.set_ylabel('Count')
+
+        labels_emotions = [item['label'] for item in output_list_emotions]
+        label_counts_emotions = {label: labels_emotions.count(label) for label in set(labels_emotions)}
+
+        bar_fig_emotions, bar_ax_emotions = plt.subplots()
+        bar_ax_emotions.bar(label_counts_emotions.keys(), label_counts_emotions.values())
+        bar_ax_emotions.set_title('Distribution of Emotions')
+        bar_ax_emotions.set_xlabel('Emotions')
+        bar_ax_emotions.set_ylabel('Count')
+        
         # plt.show()
         # Use Streamlit columns to display the images and pie chart side by side
-        col1, col2 = st.columns(2)
+        row1, row2, row3, row4 = st.rows(4)
 
-        with col1:
+        with row1:
             st.pyplot(fig)  # Display the stitched person images
 
-        with col2:
+        with row2:
             st.pyplot(pie_fig)  # Display the pie chart
+    
+        with row3:
+            st.pyplot(bar_fig)  # Display the bar chart
+
+        with row4:
+            st.pyplot(bar_fig_emotions)  # Display the bar chart
 
     elif file_name.type.startswith('video'):
         # Save the uploaded video to a temporary file