Update app.py

app.py

@@ -12,26 +12,28 @@ from pypinyin import lazy_pinyin, Style
 from matplotlib.backends.backend_pdf import PdfPages
 
 def get_font(size=14):
+    """Fetches the font properties for the SimHei font."""
     font_path = "simHei.ttc"
     if not os.path.exists(font_path):
         font_path = "SimHei.ttf"
     return font_manager.FontProperties(fname=font_path, size=size)
 
 def get_pinyin_abbr(text):
-    """获取文本前两个汉字的拼音首字母"""
+    """Gets the first letter of the Pinyin for the first two Chinese characters of a text."""
     if not text:
         return ""
-    # 提取前两个汉字
+    # Extract the first two Chinese characters
     chars = [c for c in text if '\u4e00' <= c <= '\u9fff']
     if len(chars) < 2:
         chars = chars + [''] * (2 - len(chars))
     else:
         chars = chars[:2]
-    # 获取拼音首字母
+    # Get the first letter of the Pinyin
     pinyin_list = lazy_pinyin(chars, style=Style.FIRST_LETTER)
     return ''.join(pinyin_list).upper()
 
 def process_schedule(file):
+    """Processes the uploaded schedule file to extract and format movie showtimes."""
     try:
         date_df = pd.read_excel(file, header=None, skiprows=7, nrows=1, usecols=[3])
         date_str = pd.to_datetime(date_df.iloc[0, 0]).strftime('%Y-%m-%d')
@@ -73,7 +75,7 @@ def process_schedule(file):
         
         merged_df = pd.DataFrame(merged_rows)
         
-        # 将开始时间统一提前10分钟，结束时间统一提前5分钟
+        # Adjust start time 10 minutes earlier, end time 5 minutes earlier
         merged_df['StartTime_dt'] = merged_df['StartTime_dt'] - timedelta(minutes=10)
         merged_df['EndTime_dt'] = merged_df['EndTime_dt'] - timedelta(minutes=5)
         
@@ -85,28 +87,26 @@ def process_schedule(file):
         return None, date_str
 
 def create_print_layout(data, date_str):
+    """Creates the PNG and PDF print layouts for the schedule."""
     if data is None or data.empty:
         return None
     
-    # 创建PNG图像 - 使用A4纸张大小并最大化内容
+    # Create PNG image - A4 size, maximized content
     png_fig = plt.figure(figsize=(8.27, 11.69), dpi=300)
     png_ax = png_fig.add_subplot(111)
     png_ax.set_axis_off()
-    # 为PNG设置更小的边距以最大化内容
     png_fig.subplots_adjust(left=0.02, right=0.98, top=0.98, bottom=0.02)
     
-    # 创建PDF图像 - 使用A4纸张大小
+    # Create PDF image - A4 size
     pdf_fig = plt.figure(figsize=(8.27, 11.69), dpi=300)
     pdf_ax = pdf_fig.add_subplot(111)
     pdf_ax.set_axis_off()
-    # 为PDF设置更小的边距
     pdf_fig.subplots_adjust(left=0.02, right=0.98, top=0.98, bottom=0.02)
     
-    # 处理两个图形的共同函数
+    # Common function to process both figures
     def process_figure(fig, ax, is_pdf=False):
         # Pre-load fonts
         date_font = get_font(12)
-        # 使用更大的字体以最大化利用纸张空间
         font_size_multiplier = 1.2
         movie_font_size = 14 * font_size_multiplier
         hall_font_size = movie_font_size * 0.8
@@ -119,7 +119,7 @@ def create_print_layout(data, date_str):
         halls = sorted(data['Hall'].unique(), key=lambda h: int(h.replace('号','')) if h else 0)
         
         total_lines = sum(len(data[data['Hall'] == hall]) for hall in halls) + (len(halls) - 1)
-        available_height = 0.98 - 0.02  # 增加可用高度
+        available_height = 0.98 - 0.02
         line_spacing = available_height / total_lines if total_lines > 0 else 0.04
         y_position = 0.98
         
@@ -127,45 +127,37 @@ def create_print_layout(data, date_str):
             hall_data = data[data['Hall'] == hall]
             y_block_top = y_position
             hall_num = hall.replace("号", "")
-            hall_text = f"${hall_num}^{{\\#}}$"
+            hall_text_template = f"${hall_num}^{{\\#}}$"
             movie_count = 1
             
             for _, row in hall_data.iterrows():
-                ax.text(0.03, y_position, hall_text if movie_count == 1 else "",
+                pinyin_abbr = get_pinyin_abbr(row['Movie'])
+                hall_text = hall_text_template if movie_count == 1 else ""
+
+                # Draw a line of dots underneath the text
+                dots = '·' * 300  # A large number of dots
+                ax.text(0.03, y_position, dots,
+                        fontsize=movie_font_size, color='gray',
+                        ha='left', va='top', fontproperties=movie_font,
+                        transform=ax.transAxes, zorder=1.5, clip_on=True)
+
+                # Draw Hall, Movie, and Time text with a white background to create the leader effect
+                ax.text(0.03, y_position, hall_text,
                         fontsize=hall_font_size, fontweight='bold',
                         ha='left', va='top', fontproperties=hall_font,
-                        transform=ax.transAxes, zorder=2)
-                
-                # 获取电影名前两个字的拼音首字母
-                pinyin_abbr = get_pinyin_abbr(row['Movie'])
+                        transform=ax.transAxes, zorder=2,
+                        bbox=dict(boxstyle="square,pad=0.1", fc="white", ec="none"))
                 
-                # 电影名称左对齐，限制在0.2到0.6的区域内
                 ax.text(0.20, y_position, f"{movie_count}. {pinyin_abbr} {row['Movie']}",
                         fontsize=movie_font_size, ha='left', va='top', fontproperties=movie_font,
                         transform=ax.transAxes, zorder=2, clip_on=True,
-                        bbox=dict(boxstyle="square,pad=0.0", fc="none", ec="none", alpha=0))
+                        bbox=dict(boxstyle="square,pad=0.1", fc="white", ec="none"))
                 
-                # 时间信息右对齐，固定在0.95位置
                 ax.text(0.95, y_position, f"{row['StartTime_str']} - {row['EndTime_str']}",
                         fontsize=movie_font_size, ha='right', va='top', fontproperties=movie_font,
-                        transform=ax.transAxes, zorder=2)
+                        transform=ax.transAxes, zorder=2,
+                        bbox=dict(boxstyle="square,pad=0.1", fc="white", ec="none"))
                 
-                # --- Start of added code ---
-                # Calculate vertical position for the dotted line, centered in the row
-                line_y = y_position - (line_spacing * 0.4)
-
-                # Dotted line between hall number and movie title
-                if movie_count == 1:
-                    ax.plot([0.1, 0.18], [line_y, line_y],
-                            linestyle='dotted', color='gray', linewidth=1,
-                            transform=ax.transAxes, zorder=1)
-                
-                # Dotted line between movie title and time
-                ax.plot([0.65, 0.85], [line_y, line_y],
-                        linestyle='dotted', color='gray', linewidth=1,
-                        transform=ax.transAxes, zorder=1)
-                # --- End of added code ---
-
                 y_position -= line_spacing
                 movie_count += 1
             
@@ -177,20 +169,18 @@ def create_print_layout(data, date_str):
                                   linewidth=0.8, zorder=1, transform=ax.transAxes)
             ax.add_patch(rect)
     
-    # 处理PNG图形
+    # Process the figures
     process_figure(png_fig, png_ax)
-    
-    # 处理PDF图形
     process_figure(pdf_fig, pdf_ax, is_pdf=True)
     
-    # 保存PNG图像 - 使用最小边距以最大化内容
+    # Save PNG image
     png_buffer = io.BytesIO()
     png_fig.savefig(png_buffer, format='png', bbox_inches='tight', pad_inches=0.05)
     png_buffer.seek(0)
     image_base64 = base64.b64encode(png_buffer.getvalue()).decode()
     plt.close(png_fig)
     
-    # 保存PDF文件 - 使用最小边距
+    # Save PDF file
     pdf_buffer = io.BytesIO()
     with PdfPages(pdf_buffer) as pdf:
         pdf.savefig(pdf_fig, bbox_inches='tight', pad_inches=0.05)
@@ -204,12 +194,13 @@ def create_print_layout(data, date_str):
     }
 
 def display_pdf(base64_pdf):
-    # 在Streamlit中显示PDF
+    """Generates the HTML to display a base64 encoded PDF in Streamlit."""
     pdf_display = f"""
     <iframe src="{base64_pdf}" width="100%" height="800" type="application/pdf"></iframe>
     """
     return pdf_display
 
+# --- Streamlit App ---
 st.set_page_config(page_title="LED 屏幕时间表打印", layout="wide")
 st.title("LED 屏幕时间表打印")
 
@@ -221,7 +212,7 @@ if uploaded_file:
         if schedule is not None:
             output = create_print_layout(schedule, date_str)
             
-            # 创建选项卡以切换PNG和PDF视图
+            # Create tabs for PDF and PNG views
             tab1, tab2 = st.tabs(["PDF 预览", "PNG 预览"])
             
             with tab1: