Update app.py

app.py

@@ -7,12 +7,11 @@ import base64
 import matplotlib.gridspec as gridspec
 import math
 from matplotlib.backends.backend_pdf import PdfPages
-# The 'FancyBboxPatch' is no longer needed for the new border style.
 
 SPLIT_TIME = "17:30"
 BUSINESS_START = "09:30"
 BUSINESS_END = "01:30"
-BORDER_COLOR = 'gray' # Changed to gray for the new style
+BORDER_COLOR = '#A9A9A9'
 DATE_COLOR = '#A9A9A9'
 
 def process_schedule(file):
@@ -20,74 +19,72 @@ def process_schedule(file):
     try:
         # 读取 Excel，跳过前 8 行
         df = pd.read_excel(file, skiprows=8)
-
+        
         # 提取所需列 (G9, H9, J9)
         df = df.iloc[:, [6, 7, 9]]  # G, H, J 列
         df.columns = ['Hall', 'StartTime', 'EndTime']
-
+        
         # 清理数据
         df = df.dropna(subset=['Hall', 'StartTime', 'EndTime'])
-
-        # 转换影厅格式为 "#" 格式 (移除末尾空格)
-        df['Hall'] = df['Hall'].str.extract(r'(\d+)号').astype(str)
-
+        
+        # 转换影厅格式为 "#号" 格式
+        df['Hall'] = df['Hall'].str.extract(r'(\d+)号').astype(str) + ' '
+        
         # 保存原始时间字符串用于诊断
         df['original_end'] = df['EndTime']
-
+        
         # 转换时间为 datetime 对象
         base_date = datetime.today().date()
         df['StartTime'] = pd.to_datetime(df['StartTime'])
         df['EndTime'] = pd.to_datetime(df['EndTime'])
-
+        
         # 设置基准时间
         business_start = datetime.strptime(f"{base_date} {BUSINESS_START}", "%Y-%m-%d %H:%M")
         business_end = datetime.strptime(f"{base_date} {BUSINESS_END}", "%Y-%m-%d %H:%M")
-
+        
         # 处理跨天情况
         if business_end < business_start:
             business_end += timedelta(days=1)
-
+        
         # 标准化所有时间到同一天
         for idx, row in df.iterrows():
             end_time = row['EndTime']
             if end_time.hour < 9:
                 df.at[idx, 'EndTime'] = end_time + timedelta(days=1)
-
+            
             if row['StartTime'].hour >= 21 and end_time.hour < 9:
                 df.at[idx, 'EndTime'] = end_time + timedelta(days=1)
-
+        
         # 筛选营业时间内的场次
         df['time_for_comparison'] = df['EndTime'].apply(
             lambda x: datetime.combine(base_date, x.time())
         )
-
+        
         df.loc[df['time_for_comparison'].dt.hour < 9, 'time_for_comparison'] += timedelta(days=1)
-
+        
         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 = df[valid_times]
-
+        
         # 按散场时间排序
         df = df.sort_values('EndTime')
-
+        
         # 分割数据
-        split_time_obj = datetime.strptime(SPLIT_TIME, "%H:%M").time()
-        split_datetime = datetime.combine(base_date, split_time_obj)
-
-        part1 = df[df['time_for_comparison'] <= split_datetime].copy()
-        part2 = df[df['time_for_comparison'] > split_datetime].copy()
-
+        split_time = datetime.strptime(f"{base_date} {SPLIT_TIME}", "%Y-%m-%d %H:%M")
+        split_time_for_comparison = df['time_for_comparison'].apply(
+            lambda x: datetime.combine(base_date, split_time.time())
+        )
+        
+        part1 = df[df['time_for_comparison'] <= split_time_for_comparison].copy()
+        part2 = df[df['time_for_comparison'] > split_time_for_comparison].copy()
+        
         # 格式化时间显示
         for part in [part1, part2]:
-            # Use '%-H' for 24-hour format without leading zero on Linux/macOS
-            # Use '%#H' on Windows. A more cross-platform way is to format and remove later.
-            # Let's stick to '%H:%M' for universal 24-hour format e.g., "09:30"
-            part['EndTime'] = part['EndTime'].dt.strftime('%H:%M')
-
-
+            part['EndTime'] = part['EndTime'].dt.strftime('%-I:%M')
+        
         # 关键修改：精确读取C6单元格
         date_df = pd.read_excel(
             file,
@@ -97,7 +94,7 @@ def process_schedule(file):
             header=None    # 无表头
         )
         date_cell = date_df.iloc[0, 0]
-
+        
         try:
             # 处理不同日期格式
             if isinstance(date_cell, str):
@@ -106,152 +103,139 @@ def process_schedule(file):
                 date_str = pd.to_datetime(date_cell).strftime('%Y-%m-%d')
         except:
             date_str = datetime.today().strftime('%Y-%m-%d')
-
+        
         return part1[['Hall', 'EndTime']], part2[['Hall', 'EndTime']], date_str
-
+    
     except Exception as e:
         st.error(f"处理文件时出错: {str(e)}")
         return None, None, None
 
-
 def create_print_layout(data, title, date_str):
-    """创建打印布局 (PNG 和 PDF)"""
+    """
+    创建基于精确A5网格的打印布局 (PNG 和 PDF)，具有点状虚线边框和动态字体大小。
+    """
     if data.empty:
         return None
 
-    # --- A5 Paper Dimensions in inches for precise layout ---
-    A5_WIDTH_IN = 5.83
-    A5_HEIGHT_IN = 8.27
-    NUM_COLS = 3
+    # A5 纸张尺寸（英寸）和 DPI
+    A5_WIDTH_INCHES = 5.83
+    A5_HEIGHT_INCHES = 8.27
+    DPI = 300
 
-    # --- Create Figures for PNG and PDF ---
-    png_fig = plt.figure(figsize=(A5_WIDTH_IN, A5_HEIGHT_IN), dpi=300)
-    pdf_fig = plt.figure(figsize=(A5_WIDTH_IN, A5_HEIGHT_IN), dpi=300)
+    # 为 PNG 和 PDF 创建图形
+    png_fig = plt.figure(figsize=(A5_WIDTH_INCHES, A5_HEIGHT_INCHES), dpi=DPI)
+    pdf_fig = plt.figure(figsize=(A5_WIDTH_INCHES, A5_HEIGHT_INCHES), dpi=DPI)
 
-    # --- Internal drawing function to apply changes to both figures ---
     def process_figure(fig):
+        # 设置支持中文的字体
         plt.rcParams['font.family'] = 'sans-serif'
         plt.rcParams['font.sans-serif'] = ['Arial Unicode MS']
 
-        total_items = len(data)
-        if total_items == 0:
-            plt.close(fig)
-            return
+        # 使网格充满整个画布，无边距
+        fig.subplots_adjust(left=0, right=1, top=1, bottom=0)
 
-        # --- 1. Redesign Print Layout ---
-        # Calculate number of rows needed
-        num_rows = math.ceil(total_items / NUM_COLS)
+        # 计算网格维度
+        total_items = len(data)
+        num_cols = 3
+        num_rows = math.ceil(total_items / num_cols)
         
-        # Remove all padding from the figure edges
-        fig.subplots_adjust(left=0, right=1, top=0.95, bottom=0)
+        if num_rows == 0:
+            return  # 如果没有数据则退出
 
-        # Create a grid with no space between cells. A small top row for the date.
-        gs = gridspec.GridSpec(
-            num_rows + 1,
-            NUM_COLS,
-            hspace=0,
-            wspace=0,
-            height_ratios=[0.3] + [1] * num_rows, # Make date row shorter
-            figure=fig
-        )
+        # 创建网格布局，为日期/标题行分配较小的高度
+        height_ratios = [0.4] + [1] * num_rows
+        gs = gridspec.GridSpec(num_rows + 1, num_cols, 
+                               height_ratios=height_ratios,
+                               wspace=0, hspace=0, figure=fig)
 
+        # 准备数据，按Z字形（列优先）排序
         data_values = data.values.tolist()
-
-        # Pad data with empty values to make it a multiple of NUM_COLS
-        while len(data_values) % NUM_COLS != 0:
+        while len(data_values) % num_cols != 0:
             data_values.append(['', ''])
 
-        # --- Sort data column-first (Z-pattern) ---
-        rows_per_col_layout = math.ceil(len(data_values) / NUM_COLS)
+        rows_per_col_layout = math.ceil(len(data_values) / num_cols)
         sorted_data = [['', '']] * len(data_values)
         for i, item in enumerate(data_values):
             if item[0] and item[1]:
                 row_in_col = i % rows_per_col_layout
                 col_idx = i // rows_per_col_layout
-                new_index = row_in_col * NUM_COLS + col_idx
+                new_index = row_in_col * num_cols + col_idx
                 if new_index < len(sorted_data):
                     sorted_data[new_index] = item
-
-        # --- Dynamic Font Size Calculation ---
-        def get_dynamic_fontsize(text, cell_width_inches):
-            if not text:
-                return 1
-            # This factor is empirical, adjusts font size to fill ~90% of cell width
-            # A lower factor (e.g., 0.5) results in larger text.
-            ASPECT_RATIO_FACTOR = 0.55
-            num_chars = len(text)
-            # Formula: (target_width_points) / (num_characters * aspect_ratio)
-            fontsize = (cell_width_inches * 0.9 * 72) / (num_chars * ASPECT_RATIO_FACTOR)
-            return max(10, fontsize) # Return at least size 10
-
-        cell_width_inches = A5_WIDTH_IN / NUM_COLS
-
-        # --- Draw each data cell ---
+        
+        # --- 动态计算字体大小 ---
+        # 1. 找到最长的文本字符串
+        longest_string = ""
+        for hall, end_time in sorted_data:
+            if hall and end_time:
+                text = f"{hall}{end_time}"
+                if len(text) > len(longest_string):
+                    longest_string = text
+        
+        base_fontsize = 10  # 默认字体大小
+        if longest_string:
+            # 2. 计算单元格宽度（以磅为单位，1英寸=72磅）
+            fig_width_pt = fig.get_figwidth() * 72
+            cell_width_pt = fig_width_pt / num_cols
+            
+            # 3. 目标文本宽度为单元格宽度的80%
+            target_text_width_pt = cell_width_pt * 0.8
+            
+            # 4. 根据经验系数估算字体大小
+            # (字符宽度约等于字体大小的0.6倍)
+            char_width_factor = 0.6
+            base_fontsize = (target_text_width_pt / len(longest_string)) / char_width_factor
+
+        # 绘制数据单元格
         for idx, (hall, end_time) in enumerate(sorted_data):
             if hall and end_time:
-                row_grid = idx // NUM_COLS + 1  # +1 to skip date row
-                col_grid = idx % NUM_COLS
+                row_grid = idx // num_cols + 1  # +1 是因为日期行占了第0行
+                col_grid = idx % num_cols
                 
                 ax = fig.add_subplot(gs[row_grid, col_grid])
-                
-                display_text = f"{hall} {end_time}"
-                
-                # Calculate optimal font size
-                fontsize = get_dynamic_fontsize(display_text, cell_width_inches)
 
+                # 设置灰色点状虚线边框
+                for spine in ax.spines.values():
+                    spine.set_visible(True)
+                    spine.set_color(BORDER_COLOR)
+                    spine.set_linestyle(':')  # 点状线
+                    spine.set_linewidth(1)
+
+                display_text = f"{hall}{end_time}"
                 ax.text(0.5, 0.5, display_text,
-                        fontsize=fontsize,
+                        fontsize=base_fontsize,
                         fontweight='bold',
-                        ha='center',
-                        va='center',
+                        ha='center', va='center',
                         transform=ax.transAxes)
 
-                # --- 2. Change Cell Border ---
-                # Set a dotted gray border
-                for spine in ax.spines.values():
-                    spine.set_visible(True)
-                    spine.set_linestyle((0, (1, 2))) # Dotted line: (0, (on, off))
-                    spine.set_edgecolor(BORDER_COLOR)
-                    spine.set_linewidth(1.5)
-
                 ax.set_xticks([])
                 ax.set_yticks([])
-                ax.set_facecolor('none')
 
-        # --- Add date and title information to the top row ---
+        # 在顶部添加日期/标题信息
         ax_date = fig.add_subplot(gs[0, :])
-        ax_date.text(0.01, 0.5, f"{date_str} {title}",
-                     fontsize=12,
+        ax_date.text(0.02, 0.5, f"{date_str} {title}",
+                     fontsize=base_fontsize * 0.6,  # 日期字体稍小
                      color=DATE_COLOR,
                      fontweight='bold',
-                     ha='left',
-                     va='center',
+                     ha='left', va='center',
                      transform=ax_date.transAxes)
-        
-        # Hide the border for the date cell
-        for spine in ax_date.spines.values():
-            spine.set_visible(False)
-        ax_date.set_xticks([])
-        ax_date.set_yticks([])
-        ax_date.set_facecolor('none')
+        ax_date.set_axis_off()
 
-    # Process both the PNG and PDF figures with the new layout
+    # --- 处理并保存图形 ---
     process_figure(png_fig)
     process_figure(pdf_fig)
 
-    # --- Save PNG ---
+    # 保存为 PNG
     png_buffer = io.BytesIO()
-    # Use pad_inches=0 because we handled margins with subplots_adjust
-    png_fig.savefig(png_buffer, format='png', pad_inches=0)
+    png_fig.savefig(png_buffer, format='png') # 移除 bbox_inches 和 pad_inches
     png_buffer.seek(0)
     png_base64 = base64.b64encode(png_buffer.getvalue()).decode()
     plt.close(png_fig)
 
-    # --- Save PDF ---
+    # 保存为 PDF
     pdf_buffer = io.BytesIO()
     with PdfPages(pdf_buffer) as pdf:
-        # Use pad_inches=0 for PDF as well
-        pdf.savefig(pdf_fig, pad_inches=0)
+        pdf.savefig(pdf_fig) # 移除 bbox_inches 和 pad_inches
     pdf_buffer.seek(0)
     pdf_base64 = base64.b64encode(pdf_buffer.getvalue()).decode()
     plt.close(pdf_fig)
@@ -261,13 +245,13 @@ def create_print_layout(data, title, date_str):
         'pdf': f'data:application/pdf;base64,{pdf_base64}'
     }
 
-# --- PDF display function ---
+
 def display_pdf(base64_pdf):
-    """Embeds PDF in Streamlit for display"""
+    """在Streamlit中嵌入显示PDF"""
     pdf_display = f'<iframe src="{base64_pdf}" width="100%" height="800" type="application/pdf"></iframe>'
     return pdf_display
 
-# Streamlit UI
+# Streamlit 界面
 st.set_page_config(page_title="散厅时间快捷打印", layout="wide")
 st.title("散厅时间快捷打印")
 
@@ -277,7 +261,7 @@ if uploaded_file:
     part1, part2, date_str = process_schedule(uploaded_file)
 
     if part1 is not None and part2 is not None:
-        # Generate outputs containing both PNG and PDF data
+        # 生成包含 PNG 和 PDF 的字典
         part1_output = create_print_layout(part1, "A", date_str)
         part2_output = create_print_layout(part2, "C", date_str)
 
@@ -286,7 +270,6 @@ if uploaded_file:
         with col1:
             st.subheader("白班散场预览（时间 ≤ 17:30）")
             if part1_output:
-                # Use tabs to show both PDF and PNG previews
                 tab1_1, tab1_2 = st.tabs(["PDF 预览", "PNG 预览"])
                 with tab1_1:
                     st.markdown(display_pdf(part1_output['pdf']), unsafe_allow_html=True)
@@ -298,7 +281,6 @@ if uploaded_file:
         with col2:
             st.subheader("夜班散场预览（时间 > 17:30）")
             if part2_output:
-                # Use tabs to show both PDF and PNG previews
                 tab2_1, tab2_2 = st.tabs(["PDF 预览", "PNG 预览"])
                 with tab2_1:
                     st.markdown(display_pdf(part2_output['pdf']), unsafe_allow_html=True)