Update app.py

app.py

@@ -6,6 +6,7 @@ import io
 import base64
 from matplotlib.patches import Rectangle
 import matplotlib.gridspec as gridspec
+import math
 
 # 定义全局常量
 SPLIT_TIME = "17:30"  # 分界线时间
@@ -76,62 +77,82 @@ def create_print_layout(data, title):
     if data.empty:
         return None
         
-    # 设置 A5 纵向尺寸（单位：英寸）
+    # 设置 A5 纸张竖向尺寸（单位：英寸）
     fig = plt.figure(figsize=(5.83, 8.27), dpi=300)
     
     # 减小边距，最大化利用空间
-    plt.subplots_adjust(left=0.02, right=0.98, top=0.98, bottom=0.02)
+    plt.subplots_adjust(left=0.05, right=0.95, top=0.95, bottom=0.05)
+    
+    # 计算行数和列数
+    total_items = len(data)
+    num_cols = 3  # 固定为3列
+    num_rows = math.ceil(total_items / num_cols)  # 计算需要的行数
     
     # 创建网格，减小间距
-    rows = (len(data) + 2) // 3  # 向上取整除法
-    gs = gridspec.GridSpec(rows, 3, hspace=0.1, wspace=0.1)  # 显著减小间距
+    gs = gridspec.GridSpec(num_rows, num_cols, hspace=0.1, wspace=0.1)
     
     # 设置字体和样式
     plt.rcParams['font.family'] = 'sans-serif'
     plt.rcParams['font.sans-serif'] = ['SimHei']  # 中文字体
     
-    # 计算适合的字体大小
-    base_fontsize = min(45, 220 / rows)  # 增加基础字体大小
+    # 计算适合的字体大小（考虑到竖向布局和3列）
+    base_fontsize = min(50, 280 / num_rows)  # 调整基础字体大小
+    
+    # 重新组织数据为竖向排列
+    reshaped_data = []
+    data_values = data.values.tolist()
+    
+    # 填充空值确保数据长度是3的倍数
+    while len(data_values) % 3 != 0:
+        data_values.append(['', ''])
+    
+    # 按竖向顺序重新排列数据
+    num_rows = len(data_values) // 3
+    for col in range(3):
+        for row in range(num_rows):
+            idx = row + col * num_rows
+            if idx < len(data_values):
+                reshaped_data.append(data_values[idx])
     
     # 填充数据
-    for idx, (hall, end_time) in enumerate(data.values):
-        row = idx // 3
-        col = idx % 3
-        
-        # 创建子图
-        ax = plt.subplot(gs[row, col])
-        
-        # 设置更深的边框颜色
-        for spine in ax.spines.values():
-            spine.set_color(BORDER_COLOR)
-            spine.set_linewidth(0.5)
-        
-        # 将影厅和时间紧密连接显示
-        display_text = f"{hall}{end_time}"
-        ax.text(0.5, 0.5, display_text,
-                fontsize=base_fontsize, 
-                fontweight='bold', 
-                ha='center', 
-                va='center')
-        
-        # 设置更小的内边距
-        ax.set_xlim(-0.02, 1.02)
-        ax.set_ylim(-0.02, 1.02)
-        
-        # 移除坐标轴
-        ax.set_xticks([])
-        ax.set_yticks([])
+    for idx, (hall, end_time) in enumerate(reshaped_data):
+        if hall and end_time:  # 只处理非空数据
+            row = idx // 3
+            col = idx % 3
+            
+            # 创建子图
+            ax = plt.subplot(gs[row, col])
+            
+            # 设置更深的边框颜色
+            for spine in ax.spines.values():
+                spine.set_color(BORDER_COLOR)
+                spine.set_linewidth(0.5)
+            
+            # 将影厅和时间紧密连接显示
+            display_text = f"{hall}{end_time}"
+            ax.text(0.5, 0.5, display_text,
+                    fontsize=base_fontsize, 
+                    fontweight='bold', 
+                    ha='center', 
+                    va='center')
+            
+            # 设置更小的内边距
+            ax.set_xlim(-0.02, 1.02)
+            ax.set_ylim(-0.02, 1.02)
+            
+            # 移除坐标轴
+            ax.set_xticks([])
+            ax.set_yticks([])
     
     # 将图表转换为 base64 字符串
     buffer = io.BytesIO()
-    plt.savefig(buffer, format='png', bbox_inches='tight', pad_inches=0.05)  # 减小边距
+    plt.savefig(buffer, format='png', bbox_inches='tight', pad_inches=0.05)
     buffer.seek(0)
     image_base64 = base64.b64encode(buffer.getvalue()).decode()
     plt.close()
     
     return f'data:image/png;base64,{image_base64}'
 
-
 # Streamlit 界面
 st.set_page_config(page_title="散厅时间快捷打印", layout="wide")
 st.title("散厅时间快捷打印")
@@ -161,4 +182,4 @@ if uploaded_file:
             if part2_image:
                 st.image(part2_image)
             else:
-                st.info("夜班部分没有数据")
+                st.info("夜班部分没有数据")