Merge remote-tracking branch 'origin/master_0929' into master_0929

@@ -13,6 +13,7 @@ import javax.swing.*;
 import java.awt.*;
 import java.awt.*;
 import java.awt.Color;
 import java.awt.Color;
 import java.awt.image.BufferedImage;
 import java.awt.image.BufferedImage;
+import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
@@ -76,61 +77,57 @@ public class LatexFormulaExcelExporterUtil {
     }
     }
 
 
     /**
     /**
-     * 将LaTeX公式字符串渲染为图片字节数组
-     *
-     * @param latex    LaTeX公式字符串，如 "\\frac{-b \\pm \\sqrt{b^2-4ac}}{2a}"
-     * @param fontSize 渲染的字体大小
-     * @return 图片的字节数组 (PNG格式)
-     * @throws IOException 如果渲染或转换失败
+     * 针对Excel优化的高质量渲染
      */
      */
     public static byte[] latexToImageBytes(String latex, int fontSize) throws IOException {
     public static byte[] latexToImageBytes(String latex, int fontSize) throws IOException {
         try {
         try {
-            // 1. 创建TeXFormula对象，解析LaTeX字符串
+            // 对于Excel，使用适中的缩放和RGB格式
+            double scale = 1.5; // 1.5倍缩放平衡质量和文件大小
             TeXFormula formula = new TeXFormula(latex);
             TeXFormula formula = new TeXFormula(latex);
-
-            // 2. 创建TeXIcon，指定样式和大小
             TeXIcon icon = formula.createTeXIcon(TeXConstants.STYLE_DISPLAY, fontSize);
             TeXIcon icon = formula.createTeXIcon(TeXConstants.STYLE_DISPLAY, fontSize);
 
 
-            // 3. 创建一个BufferedImage，用于绘制公式
+            int baseWidth = icon.getIconWidth();
+            int baseHeight = icon.getIconHeight();
+            int scaledWidth = (int) (baseWidth * scale);
+            int scaledHeight = (int) (baseHeight * scale);
+
+            // 使用RGB类型，Excel兼容性更好
             BufferedImage image = new BufferedImage(
             BufferedImage image = new BufferedImage(
-                    icon.getIconWidth(),
-                    icon.getIconHeight(),
-                    BufferedImage.TYPE_INT_ARGB
+                    scaledWidth,
+                    scaledHeight,
+                    BufferedImage.TYPE_INT_RGB
             );
             );
 
 
-            // 4. 获取Graphics2D进行绘制
             Graphics2D g2 = image.createGraphics();
             Graphics2D g2 = image.createGraphics();
 
 
-            // 设置最高质量的渲染提示
+            // 针对公式渲染优化的设置
             g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
             g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
-            g2.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_LCD_HRGB);
+            g2.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_ON);
             g2.setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY);
             g2.setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY);
             g2.setRenderingHint(RenderingHints.KEY_FRACTIONALMETRICS, RenderingHints.VALUE_FRACTIONALMETRICS_ON);
             g2.setRenderingHint(RenderingHints.KEY_FRACTIONALMETRICS, RenderingHints.VALUE_FRACTIONALMETRICS_ON);
-            g2.setRenderingHint(RenderingHints.KEY_STROKE_CONTROL, RenderingHints.VALUE_STROKE_PURE);
-            g2.setRenderingHint(RenderingHints.KEY_ALPHA_INTERPOLATION, RenderingHints.VALUE_ALPHA_INTERPOLATION_QUALITY);
-            g2.setRenderingHint(RenderingHints.KEY_COLOR_RENDERING, RenderingHints.VALUE_COLOR_RENDER_QUALITY);
-            g2.setRenderingHint(RenderingHints.KEY_DITHERING, RenderingHints.VALUE_DITHER_ENABLE);
 
 
-            // 设置背景为白色
+            // 绘制白色背景
             g2.setColor(Color.WHITE);
             g2.setColor(Color.WHITE);
-            g2.fillRect(0, 0, icon.getIconWidth(), icon.getIconHeight());
+            g2.fillRect(0, 0, scaledWidth, scaledHeight);
 
 
-            // 设置公式颜色为黑色
+            // 应用缩放
+            g2.scale(scale, scale);
+
+            // 绘制公式
             JLabel label = new JLabel();
             JLabel label = new JLabel();
             label.setForeground(Color.BLACK);
             label.setForeground(Color.BLACK);
-
-            // 5. 将公式绘制到BufferedImage上
             icon.paintIcon(label, g2, 0, 0);
             icon.paintIcon(label, g2, 0, 0);
+
             g2.dispose();
             g2.dispose();
 
 
-            // 6. 将BufferedImage转换为字节数组
+            // 使用标准PNG编码，确保Excel兼容性
             ByteArrayOutputStream baos = new ByteArrayOutputStream();
             ByteArrayOutputStream baos = new ByteArrayOutputStream();
             ImageIO.write(image, "png", baos);
             ImageIO.write(image, "png", baos);
 
 
             return baos.toByteArray();
             return baos.toByteArray();
 
 
         } catch (Exception e) {
         } catch (Exception e) {
-            throw new IOException("LaTeX渲染失败: " + e.getMessage(), e);
+            throw new IOException("LaTeX Excel优化渲染失败: " + e.getMessage(), e);
         }
         }
     }
     }
 
 
@@ -138,34 +135,51 @@ public class LatexFormulaExcelExporterUtil {
      * 将LaTeX公式作为图片插入到指定单元格
      * 将LaTeX公式作为图片插入到指定单元格
      */
      */
     public static void insertLatexImageToCell(Workbook workbook, Sheet sheet, String latex, int rowIndex, int colIndex) throws IOException {
     public static void insertLatexImageToCell(Workbook workbook, Sheet sheet, String latex, int rowIndex, int colIndex) throws IOException {
-        // 1. 将LaTeX渲染为图片字节
+        // 设置固定30像素行高
+        Row row = sheet.getRow(rowIndex);
+        if (row == null) {
+            row = sheet.createRow(rowIndex);
+        }
+
+        row.setHeightInPoints(22.5f); // 30像素
+
         byte[] imageBytes = latexToImageBytes(latex, 48);
         byte[] imageBytes = latexToImageBytes(latex, 48);
+        ByteArrayInputStream bais = new ByteArrayInputStream(imageBytes);
+        BufferedImage image = ImageIO.read(bais);
+        bais.close();
+
+        // 如果图片高度超过30像素，按比例缩小
+        double scale = 1.0;
+        if (image.getHeight() > 30) {
+            scale = 30.0 / image.getHeight();
+            System.out.println("图片需要缩放: " + scale);
+        }
 
 
-        // 2. 将图片添加到工作簿
         int pictureIdx = workbook.addPicture(imageBytes, Workbook.PICTURE_TYPE_PNG);
         int pictureIdx = workbook.addPicture(imageBytes, Workbook.PICTURE_TYPE_PNG);
-
-        // 3. 创建绘图对象
         Drawing<?> drawing = sheet.createDrawingPatriarch();
         Drawing<?> drawing = sheet.createDrawingPatriarch();
 
 
-        // 4. 创建锚点，确定图片位置
         ClientAnchor anchor = workbook.getCreationHelper().createClientAnchor();
         ClientAnchor anchor = workbook.getCreationHelper().createClientAnchor();
-        anchor.setAnchorType(ClientAnchor.AnchorType.MOVE_AND_RESIZE);
-        anchor.setCol1(colIndex); // C列 (从0开始计数)
-        anchor.setRow1(rowIndex); // 当前数据行 (表头在第0行)
-        anchor.setCol2(colIndex + 1); // 结束于D列
-        anchor.setRow2(rowIndex + 1); // 结束于下一行
-
-        // 设置较小的起始偏移
-        anchor.setDx1(50);   // 水平偏移（建议值：10-100）
-        anchor.setDy1(25);   // 垂直偏移（建议值：10-50）
-
+        anchor.setAnchorType(ClientAnchor.AnchorType.MOVE_DONT_RESIZE);
+
+        anchor.setCol1(colIndex);
+        anchor.setRow1(rowIndex);
+        anchor.setCol2(colIndex);
+        anchor.setRow2(rowIndex);
+
+        int scaledWidth = (int) (image.getWidth() * scale);
+        int rate = 1;
+        if (scaledWidth >= 60 && scaledWidth <= 150) {
+            rate = 2;
+        } else if (scaledWidth > 150) {
+            rate = 3;
+        }
 
 
-        // 5. 创建图片并插入
-        Picture pict = drawing.createPicture(anchor, pictureIdx);
+        anchor.setDx1(25);
+        anchor.setDy1(25);
+        anchor.setDx2(330 * rate);
+        anchor.setDy2(235);
 
 
-        // 6. 自动调整图片大小以适应单元格 (可选)
-        // 取消注释此行使图片自动适应锚点区域
-//        pict.resize(0.95); // 缩小到90%，自然产生边距
+        drawing.createPicture(anchor, pictureIdx);
     }
     }
 
 
     /**
     /**