add image file recognize

pom.xml

@@ -23,7 +23,7 @@
         <dependency>
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-all</artifactId>
-            <version>4.5.1</version>
+            <version>4.5.16</version>
         </dependency>
 
         <dependency>
@@ -77,7 +77,7 @@
                 <version>8.8.3</version>
                 <configuration>
                     <mainClass>com.luooqi.ocr.MainFm</mainClass>
-                    <bundler>dmg</bundler>
+                    <bundler>exe</bundler>
                     <jfxAppOutputDir>${project.build.directory}/app</jfxAppOutputDir>
                     <nativeOutputDir>${project.build.directory}/native</nativeOutputDir>
                     <appName>treehole</appName>
@@ -86,6 +86,8 @@
                     <needShortcut>true</needShortcut>
                     <bundleArguments>
                         <runtime />
+                        <copyright>luooqi@2019</copyright>
+                        <installdirChooser>true</installdirChooser>
                     </bundleArguments>
                     <nativeReleaseVersion>${soft.version}</nativeReleaseVersion>
                 </configuration>

src/main/java/com/luooqi/ocr/MainFm.java

@@ -1,6 +1,7 @@
 package com.luooqi.ocr;
 
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.log.StaticLog;
 import com.luooqi.ocr.controller.ProcessController;
 import com.luooqi.ocr.model.CaptureInfo;
 import com.luooqi.ocr.model.StageInfo;
@@ -22,10 +23,14 @@
 import javafx.scene.paint.Color;
 import javafx.scene.text.Font;
 import javafx.scene.text.FontPosture;
+import javafx.stage.FileChooser;
 import javafx.stage.Stage;
 import org.jnativehook.GlobalScreen;
 
+import javax.imageio.ImageIO;
 import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.logging.Level;
@@ -68,6 +73,7 @@ public void start(Stage primaryStage) {
 
         HBox topBar = new HBox(
                 CommUtils.createButton("snapBtn", MainFm::doSnap, "截图"),
+                CommUtils.createButton("openImageBtn", MainFm::recImage, "打开"),
                 CommUtils.createButton("copyBtn", this::copyText, "复制"),
                 CommUtils.createButton("pasteBtn", this::pasteText, "粘贴"),
                 CommUtils.createButton("clearBtn", this::clearText, "清空"),
@@ -147,6 +153,25 @@ public static void doSnap() {
         runLater(screenCapture::prepareForCapture);
     }
 
+    private static void recImage() {
+        FileChooser fileChooser = new FileChooser();
+        fileChooser.setTitle("Please Select Image File");
+        fileChooser.getExtensionFilters().addAll(new FileChooser.ExtensionFilter("Image Files", "*.png", "*.jpg"));
+        File selectedFile = fileChooser.showOpenDialog(stage);
+        if (selectedFile == null || !selectedFile.isFile()) {
+            return;
+        }
+        stageInfo = new StageInfo(stage.getX(), stage.getY(),
+                stage.getWidth(), stage.getHeight(), stage.isFullScreen());
+        MainFm.stage.close();
+        try {
+            BufferedImage image = ImageIO.read(selectedFile);
+            doOcr(image);
+        } catch (IOException e) {
+            StaticLog.error(e);
+        }
+    }
+
     public static void cancelSnap() {
         runLater(screenCapture::cancelSnap);
     }

src/main/java/com/luooqi/ocr/utils/CommUtils.java

@@ -1,7 +1,5 @@
 package com.luooqi.ocr.utils;
 
-import cn.hutool.core.swing.RobotUtil;
-import cn.hutool.core.swing.ScreenUtil;
 import cn.hutool.core.util.CharUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HttpRequest;
@@ -13,9 +11,8 @@
 import javafx.geometry.Insets;
 import javafx.geometry.Orientation;
 import javafx.geometry.Rectangle2D;
-import javafx.scene.Scene;
-import javafx.scene.control.*;
 import javafx.scene.control.Button;
+import javafx.scene.control.*;
 import javafx.scene.layout.Background;
 import javafx.scene.layout.BackgroundFill;
 import javafx.scene.layout.CornerRadii;
@@ -36,8 +33,10 @@
 import java.io.IOException;
 import java.lang.reflect.Method;
 import java.net.URL;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.Iterator;
 import java.util.List;
-import java.util.*;
 import java.util.regex.Pattern;
 
 public class CommUtils {
@@ -96,7 +95,7 @@ static String combineTextBlocks(List<TextBlock> textBlocks, boolean isEng) {
         int maxX = -1;
         double maxAngle = -100;
         for (TextBlock textBlock : textBlocks) {
-            System.out.println(textBlock.getAngle()+ "\t" + textBlock.getFontSize());
+            //System.out.println(textBlock.getAngle()+ "\t" + textBlock.getFontSize());
             if (textBlock.getTopLeft().x < minX) {
                 minX = textBlock.getTopLeft().x;
                 minBlock = textBlock;

src/main/resources/css/main.css

@@ -11,6 +11,10 @@
     -fx-background-image: url(/img/screenshot.png);
 }
 
+#openImageBtn{
+    -fx-background-image: url(/img/add-image.png);
+}
+
 #clearBtn{
      -fx-background-image: url(/img/clear.png);
  }