Update app.py

app.py

@@ -6,7 +6,6 @@ import io
 import base64
 import matplotlib.gridspec as gridspec
 import math
-import re
 
 SPLIT_TIME = "17:30"
 BUSINESS_START = "09:30"
@@ -27,8 +26,8 @@ def process_schedule(file):
         # 清理数据
         df = df.dropna(subset=['Hall', 'StartTime', 'EndTime'])
         
-        # 转换影厅格式为带LaTeX上标井号
-        df['Hall'] = df['Hall'].str.extract(r'(\d+)号').astype(str) + r'$^{\#}$'
+        # 转换影厅格式为 "#号" 格式
+        df['Hall'] = df['Hall'].str.extract(r'(\d+)号').astype(str) + ' '
         
         # 保存原始时间字符串用于诊断
         df['original_end'] = df['EndTime']
@@ -64,7 +63,7 @@ def process_schedule(file):
         
         valid_times = (
             ((df['time_for_comparison'] >= datetime.combine(base_date, business_start.time())) &
-            (df['time_for_comparison'] <= datetime.combine(base_date + timedelta(days=1), business_end.time()))
+             (df['time_for_comparison'] <= datetime.combine(base_date + timedelta(days=1), business_end.time())))
         )
         
         df = df[valid_times]
@@ -85,17 +84,18 @@ def process_schedule(file):
         for part in [part1, part2]:
             part['EndTime'] = part['EndTime'].dt.strftime('%-I:%M')
         
-        # 读取日期信息
+        # 关键修改：精确读取C6单元格
         date_df = pd.read_excel(
             file,
-            skiprows=5,
-            nrows=1,
-            usecols=[2],
-            header=None
+            skiprows=5,    # 跳过前5行（0-4）
+            nrows=1,       # 只读1行
+            usecols=[2],   # 第三列（C列）
+            header=None    # 无表头
         )
         date_cell = date_df.iloc[0, 0]
         
         try:
+            # 处理不同日期格式
             if isinstance(date_cell, str):
                 date_str = datetime.strptime(date_cell, '%Y-%m-%d').strftime('%Y-%m-%d')
             else:
@@ -114,7 +114,7 @@ def create_print_layout(data, title, date_str):
     if data.empty:
         return None
         
-    # 设置 A5 纸张横向尺寸
+    # 设置 A5 纸张竖向尺寸
     fig = plt.figure(figsize=(5.83, 8.27), dpi=300)
     plt.subplots_adjust(left=0.05, right=0.95, top=0.95, bottom=0.05)
     
@@ -127,37 +127,24 @@ def create_print_layout(data, title, date_str):
     num_cols = 3
     num_rows = math.ceil(total_items / num_cols)
     
-    # 创建网格（优化间距参数）
-    gs = gridspec.GridSpec(num_rows + 1, num_cols, 
-                         hspace=0.2, wspace=0.2,  # 增加行列间距
-                         height_ratios=[1.2] * num_rows + [0.2])
+    # 创建网格
+    gs = gridspec.GridSpec(num_rows + 1, num_cols, hspace=0.1, wspace=0.1, height_ratios=[1] * num_rows + [0.2])
     
-    # 计算最大字符数
-    max_char_count = 0
-    for hall, end_time in data.values:
-        clean_hall = re.sub(r'\$.*?\$', '#', hall)
-        clean_text = f"{clean_hall}{end_time}"
-        current_count = len(clean_text)
-        max_char_count = max(max_char_count, current_count)
+    base_fontsize = min(30, 265 / num_rows)
     
-    # 动态计算基础字号（优化计算参数）
-    cell_width_inches = 5.83 / 3  # 每列宽度（A5横向）
-    available_width = cell_width_inches * 0.65 * 72  # 可用宽度减少到65%
-    avg_char_width = 0.8  # 加粗字体宽度系数
-    base_fontsize = available_width / (max_char_count * avg_char_width)
-    base_fontsize = min(26, base_fontsize)  # 设置最大字号限制
-    
-    # 填充数据
     data_values = data.values.tolist()
+    
     while len(data_values) % 3 != 0:
         data_values.append(['', ''])
         
+    rows_per_col = math.ceil(len(data_values) / 3)
+    
     sorted_data = [['', '']] * len(data_values)
     
     for i, item in enumerate(data_values):
         if item[0] and item[1]:
-            row = i % math.ceil(len(data_values)/3)
-            col = i // math.ceil(len(data_values)/3)
+            row = i % rows_per_col
+            col = i // rows_per_col
             new_index = row * 3 + col
             if new_index < len(sorted_data):
                 sorted_data[new_index] = item
@@ -169,21 +156,19 @@ def create_print_layout(data, title, date_str):
             
             ax = plt.subplot(gs[row, col])
             
-            # 设置单元格边界范围（增加内边距）
-            ax.set_xlim(0.1, 0.9)  # 左右各留10%边距
-            ax.set_ylim(0.1, 0.9)  # 上下各留10%边距
-            
             for spine in ax.spines.values():
                 spine.set_color(BORDER_COLOR)
                 spine.set_linewidth(0.5)
             
-            # 添加文本（字号缩小5%）
-            ax.text(0.5, 0.5, f"{hall}{end_time}",
-                    fontsize=base_fontsize*0.95,
+            display_text = f"{hall}{end_time}"
+            ax.text(0.5, 0.5, display_text,
+                    fontsize=base_fontsize,
                     fontweight='bold',
                     ha='center',
-                    va='center',
-                    transform=ax.transAxes)
+                    va='center')
+            
+            ax.set_xlim(-0.02, 1.02)
+            ax.set_ylim(-0.02, 1.02)
             
             ax.set_xticks([])
             ax.set_yticks([])
@@ -239,4 +224,3 @@ if uploaded_file:
                 st.image(part2_image)
             else:
                 st.info("夜班部分没有数据")
-