From 24965b9c638bc3dbd8bf040e2ade6a62b9e68820 Mon Sep 17 00:00:00 2001
From: wangbing <wangbing@wbsite.xyz>
Date: Thu, 5 Sep 2024 10:26:16 +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 | 58 +++++++++++++++++-------------------
 1 file changed, 28 insertions(+), 30 deletions(-)

diff --git a/src/main/resources/main.fxml b/src/main/resources/main.fxml
index 686bdf7..45481f6 100644
--- a/src/main/resources/main.fxml
+++ b/src/main/resources/main.fxml
@@ -8,76 +8,74 @@
 <AnchorPane prefHeight="300.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/10.0.2-internal" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.example.jmacro.wjdr.JMainController">
    <children>
       <Separator layoutY="-1.0" opacity="0.5" prefWidth="200.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" />
-      <AnchorPane prefHeight="300.0" prefWidth="200.0">
-          <children>
-                <Label contentDisplay="CENTER" layoutX="17.0" layoutY="4.0" prefHeight="35.0" prefWidth="200.0" text="服务控制" 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>
+                <Label contentDisplay="CENTER" prefHeight="35.0" text="服务控制">
                <padding>
                   <Insets left="10.0" />
                </padding>
             </Label>
-            <HBox alignment="CENTER_LEFT" layoutX="10.0" layoutY="46.0" prefHeight="35.0" prefWidth="200.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="35.0">
+            <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="80.0" text="开始F1" />
-                      <Button fx:id="stop" disable="true" focusTraversable="false" mnemonicParsing="false" onMouseClicked="#onStop" prefHeight="30.0" prefWidth="80.0" text="停止F2">
+                      <Button fx:id="start" focusTraversable="false" mnemonicParsing="false" onMouseClicked="#onStart" prefHeight="30.0" prefWidth="90.0" text="开始F1" />
+                      <Button fx:id="stop" disable="true" focusTraversable="false" mnemonicParsing="false" onMouseClicked="#onStop" prefHeight="30.0" prefWidth="90.0" text="停止F2">
                      <HBox.margin>
                         <Insets left="10.0" />
                      </HBox.margin>
                   </Button>
                </children>
-               <padding>
-                  <Insets left="6.0" />
-               </padding>
             </HBox>
-                <Label contentDisplay="CENTER" layoutY="86.0" prefHeight="35.0" prefWidth="60.0" text="辅助工具" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="80.0">
+                <Label contentDisplay="CENTER" prefHeight="35.0" text="辅助工具">
                <padding>
                   <Insets left="10.0" />
                </padding>
             </Label>
-            <HBox alignment="CENTER_LEFT" layoutX="10.0" layoutY="126.0" prefHeight="35.0" prefWidth="200.0" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="115.0">
+            <HBox alignment="CENTER_LEFT" prefHeight="35.0">
                <children>
-                   <Button focusTraversable="false" mnemonicParsing="false" onMouseClicked="#pickPoint" prefHeight="30.0" prefWidth="50.0" text="采点" />
-                   <Button focusTraversable="false" mnemonicParsing="false" onMouseClicked="#pickRect" prefHeight="30.0" prefWidth="50.0" text="采区">
+                   <Button focusTraversable="false" mnemonicParsing="false" onMouseClicked="#pickPoint" prefHeight="30.0" prefWidth="60.0" text="采点" />
+                   <Button focusTraversable="false" mnemonicParsing="false" onMouseClicked="#pickRect" prefHeight="30.0" prefWidth="60.0" text="采区">
                        <HBox.margin>
                            <Insets left="10.0" />
                        </HBox.margin>
                    </Button>
-                   <Button focusTraversable="false" mnemonicParsing="false" onMouseClicked="#pickLegend" prefHeight="30.0" prefWidth="50.0" text="采图">
+                   <Button focusTraversable="false" mnemonicParsing="false" onMouseClicked="#pickLegend" prefHeight="30.0" prefWidth="60.0" text="采图">
                        <HBox.margin>
                            <Insets left="10.0" />
                        </HBox.margin>
                    </Button>
                </children>
+            </HBox>
+            <Label prefHeight="35.0" prefWidth="200.0" text="焦点预览">
                <padding>
-                  <Insets left="6.0" />
+                  <Insets left="5.0" />
                </padding>
-            </HBox>
-            <AnchorPane layoutX="6.0" AnchorPane.bottomAnchor="6.0" AnchorPane.leftAnchor="6.0" AnchorPane.rightAnchor="6.0" AnchorPane.topAnchor="0.0">
+               <VBox.margin>
+                  <Insets />
+               </VBox.margin>
+            </Label>
+            <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">
+                   <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" />
                        </viewport>
                    </ImageView>
                </children>
             </AnchorPane>
-            <Label layoutX="40.0" layoutY="165.0" prefHeight="35.0" prefWidth="200.0" text="焦点预览" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-               <padding>
-                  <Insets left="6.0" />
-               </padding>
-            </Label>
-            <Separator layoutY="164.0" opacity="0.5" prefWidth="200.0" AnchorPane.topAnchor="160.0" />
-            <Separator layoutY="85.0" opacity="0.5" prefWidth="200.0" AnchorPane.topAnchor="80.0" />
-          </children>
-      </AnchorPane>
-      <Separator opacity="0.5" orientation="VERTICAL" prefHeight="200.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="201.0" AnchorPane.topAnchor="0.0" />
-      <AnchorPane layoutX="262.0" layoutY="14.0" prefHeight="300.0" prefWidth="400.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="201.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+         </children>
+         <padding>
+            <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="300.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">
                <padding>
                   <Insets left="10.0" right="10.0" />
                </padding>
             </Label>
-            <Separator layoutX="-3.0" layoutY="39.0" opacity="0.5" prefWidth="200.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="41.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" />
          </children>
       </AnchorPane>
    </children>