From 28b2a1725cfa461cac5b889915d25416097927f2 Mon Sep 17 00:00:00 2001
From: wangbing <wangbing@wbsite.xyz>
Date: Thu, 24 Jul 2025 17:44:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=A4=87=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/main.fxml | 118 ++++++++++++++++++++++-------------
 1 file changed, 74 insertions(+), 44 deletions(-)

diff --git a/src/main/resources/main.fxml b/src/main/resources/main.fxml
index fb5c1ea..e1e312f 100644
--- a/src/main/resources/main.fxml
+++ b/src/main/resources/main.fxml
@@ -1,41 +1,56 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.geometry.*?>
-<?import javafx.scene.*?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.image.*?>
-<?import javafx.scene.layout.*?>
-
-<AnchorPane prefHeight="300.0" prefWidth="600.0" stylesheets="@main.css" xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="xyz.wbsite.jmacro.JMainController">
+<?import javafx.geometry.Insets?>
+<?import javafx.geometry.Rectangle2D?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.Separator?>
+<?import javafx.scene.control.TextArea?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.Cursor?>
+<?import javafx.scene.image.Image?>
+<?import javafx.scene.image.ImageView?>
+<?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
+<AnchorPane prefHeight="300.0" prefWidth="600.0" stylesheets="@main.css" xmlns="http://javafx.com/javafx/17.0.2-ea"
+            xmlns:fx="http://javafx.com/fxml/1" fx:controller="xyz.wbsite.jmacro.JMainController">
     <children>
-        <Separator layoutY="-1.0" opacity="0.5" prefWidth="200.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" />
-        <VBox maxWidth="204.0" minWidth="204.0" prefWidth="204.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="0.0">
+        <Separator layoutY="-1.0" opacity="0.5" prefWidth="200.0" AnchorPane.leftAnchor="0.0"
+                   AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"/>
+        <VBox maxWidth="204.0" minWidth="204.0" prefWidth="204.0" AnchorPane.bottomAnchor="0.0"
+              AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="0.0">
             <children>
                 <HBox alignment="CENTER_LEFT" prefHeight="35.0" prefWidth="200.0">
                     <children>
-                        <Button fx:id="start" focusTraversable="false" mnemonicParsing="false" onMouseClicked="#onStart" prefHeight="30.0" prefWidth="100.0" text="开始F1" />
-                        <Button fx:id="stop" disable="true" focusTraversable="false" mnemonicParsing="false" onMouseClicked="#onStop" prefHeight="30.0" prefWidth="100.0" text="停止F2">
+                        <Button fx:id="start" focusTraversable="false" mnemonicParsing="false" onMouseClicked="#onStart"
+                                prefHeight="30.0" prefWidth="100.0" text="开始F1"/>
+                        <Button fx:id="stop" disable="true" focusTraversable="false" mnemonicParsing="false"
+                                onMouseClicked="#onStop" prefHeight="30.0" prefWidth="100.0" text="停止F2">
                             <HBox.margin>
-                                <Insets left="10.0" />
+                                <Insets left="10.0"/>
                             </HBox.margin>
                         </Button>
                     </children>
+                    <VBox.margin>
+                        <Insets top="10.0"/>
+                    </VBox.margin>
                 </HBox>
                 <HBox alignment="CENTER_LEFT">
                     <children>
-                        <Label contentDisplay="CENTER" prefHeight="25.0" text="执行选项" />
+                        <Label contentDisplay="CENTER" prefHeight="25.0" text="执行选项"/>
 
                         <ImageView fx:id="set" fitHeight="12.0" fitWidth="12.0" preserveRatio="true">
                             <image>
-                                <Image url="@set.png" />
+                                <Image url="@set.png"/>
                             </image>
 
                             <HBox.margin>
-                                <Insets left="5.0" />
+                                <Insets left="5.0"/>
                             </HBox.margin>
-                     <cursor>
-                        <Cursor fx:constant="HAND" />
-                     </cursor>
+                            <cursor>
+                                <Cursor fx:constant="HAND"/>
+                            </cursor>
 
                         </ImageView>
                     </children>
@@ -43,73 +58,88 @@
 
                 <HBox alignment="CENTER_LEFT" prefHeight="25.0" prefWidth="200.0">
                     <children>
-                        <Label text="每" />
+                        <Label text="每"/>
                         <TextField alignment="CENTER" prefWidth="35.0" promptText="时间" text="60">
                             <HBox.margin>
-                                <Insets left="3.0" right="3.0" />
+                                <Insets left="3.0" right="3.0"/>
                             </HBox.margin>
                         </TextField>
-                        <Label text="秒执行1次，" />
-                        <Label text="共" />
+                        <Label text="秒执行1次，"/>
+                        <Label text="共"/>
                         <TextField alignment="CENTER" prefWidth="35.0" promptText="次数" text="1">
                             <HBox.margin>
-                                <Insets left="3.0" right="3.0" />
+                                <Insets left="3.0" right="3.0"/>
                             </HBox.margin>
                         </TextField>
-                        <Label text="次" />
+                        <Label text="次"/>
                     </children>
                 </HBox>
 
-                <Label contentDisplay="CENTER" prefHeight="25.0" text="辅助工具" />
+                <Label contentDisplay="CENTER" prefHeight="25.0" text="辅助工具"/>
 
                 <HBox alignment="CENTER_LEFT" prefHeight="35.0">
                     <children>
-                        <Button focusTraversable="false" mnemonicParsing="false" onMouseClicked="#pickPoint" prefHeight="25.0" prefWidth="50.0" text="采点" />
-                        <Button focusTraversable="false" mnemonicParsing="false" onMouseClicked="#pickRect" prefHeight="25.0" prefWidth="50.0" text="采区">
+                        <Button focusTraversable="false" mnemonicParsing="false" onMouseClicked="#pickPoint"
+                                prefHeight="25.0" prefWidth="50.0" text="采点"/>
+                        <Button focusTraversable="false" mnemonicParsing="false" onMouseClicked="#pickRect"
+                                prefHeight="25.0" prefWidth="50.0" text="采区">
                             <HBox.margin>
-                                <Insets left="5.0" />
+                                <Insets left="5.0"/>
                             </HBox.margin>
                         </Button>
-                        <Button focusTraversable="false" mnemonicParsing="false" onMouseClicked="#pickLegend" prefHeight="25.0" prefWidth="50.0" text="采图">
+                        <Button focusTraversable="false" mnemonicParsing="false" onMouseClicked="#pickLegend"
+                                prefHeight="25.0" prefWidth="50.0" text="采图">
                             <HBox.margin>
-                                <Insets left="5.0" />
+                                <Insets left="5.0"/>
                             </HBox.margin>
                         </Button>
-                        <Button focusTraversable="false" mnemonicParsing="false" onMouseClicked="#measure" prefHeight="25.0" prefWidth="50.0" text="测距">
+                        <Button focusTraversable="false" mnemonicParsing="false" onMouseClicked="#measure"
+                                prefHeight="25.0" prefWidth="50.0" text="测距">
                             <HBox.margin>
-                                <Insets left="5.0" />
+                                <Insets left="5.0"/>
                             </HBox.margin>
                         </Button>
                     </children>
                 </HBox>
 
-                <Label prefHeight="25.0" prefWidth="204.0" text="焦点预览" />
-                <AnchorPane maxHeight="108.0" maxWidth="192.0" minHeight="108.0" minWidth="192.0" prefHeight="108.0" prefWidth="192.0" style="-fx-border-color: #ddd;">
+                <Label prefHeight="25.0" prefWidth="204.0" text="焦点预览"/>
+                <AnchorPane maxHeight="108.0" maxWidth="192.0" minHeight="108.0" minWidth="192.0" prefHeight="108.0"
+                            prefWidth="192.0" style="-fx-border-color: #ddd;">
                     <children>
-                        <ImageView fx:id="preview" pickOnBounds="true" preserveRatio="true" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+                        <ImageView fx:id="preview" pickOnBounds="true" preserveRatio="true"
+                                   AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
+                                   AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
                             <viewport>
-                                <Rectangle2D height="100.0" width="188.0" />
+                                <Rectangle2D height="100.0" width="188.0"/>
                             </viewport>
                         </ImageView>
                     </children>
                 </AnchorPane>
 
-                <Label alignment="CENTER" contentDisplay="CENTER" prefHeight="35.0" prefWidth="188.0" text="©2025 一团芝麻糊" />
+                <Label alignment="CENTER" contentDisplay="CENTER" prefHeight="35.0" prefWidth="188.0"
+                       text="©2025 一团芝麻糊"/>
             </children>
             <padding>
-                <Insets left="6.0" right="6.0" />
+                <Insets left="6.0" right="6.0"/>
             </padding>
         </VBox>
-        <Separator opacity="0.5" orientation="VERTICAL" prefHeight="200.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="204.0" AnchorPane.topAnchor="0.0" />
-        <AnchorPane layoutX="262.0" layoutY="14.0" prefHeight="250.0" prefWidth="400.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="204.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+        <Separator opacity="0.5" orientation="VERTICAL" prefHeight="200.0" AnchorPane.bottomAnchor="0.0"
+                   AnchorPane.leftAnchor="204.0" AnchorPane.topAnchor="0.0"/>
+        <AnchorPane layoutX="262.0" layoutY="14.0" prefHeight="250.0" prefWidth="400.0" AnchorPane.bottomAnchor="0.0"
+                    AnchorPane.leftAnchor="204.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
             <children>
-                <Label layoutY="4.0" prefHeight="40.0" prefWidth="60.0" text="日志输出" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+                <Label layoutY="4.0" prefHeight="40.0" prefWidth="60.0" text="日志输出" AnchorPane.leftAnchor="0.0"
+                       AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
                     <padding>
-                        <Insets left="10.0" right="10.0" />
+                        <Insets left="10.0" right="10.0"/>
                     </padding>
                 </Label>
-                <Separator layoutX="-3.0" layoutY="39.0" opacity="0.5" prefWidth="200.0" AnchorPane.leftAnchor="1.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="41.0" />
-                <TextArea fx:id="console" editable="false" layoutX="1.0" layoutY="41.0" prefHeight="270.0" style="-fx-background-color: transparent; -fx-focus-color: no; -fx-control-inner-background: transparent;-fx-text-fill: #444444;" wrapText="true" AnchorPane.leftAnchor="1.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="45.0">
+                <Separator layoutX="-3.0" layoutY="39.0" opacity="0.5" prefWidth="200.0" AnchorPane.leftAnchor="1.0"
+                           AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="41.0"/>
+                <TextArea fx:id="console" editable="false" layoutX="1.0" layoutY="41.0" prefHeight="270.0"
+                          style="-fx-background-color: transparent; -fx-focus-color: no; -fx-control-inner-background: transparent;-fx-text-fill: #444444;"
+                          wrapText="true" AnchorPane.leftAnchor="1.0" AnchorPane.rightAnchor="0.0"
+                          AnchorPane.topAnchor="45.0">
 
                 </TextArea>
             </children>