Browse Source

删除多余方法

duh 6 years ago
parent
commit
35e3ecb303

+ 18 - 169
src/main/java/controller/MyPanel.java

@@ -33,13 +33,18 @@ public class MyPanel extends JPanel{
     @Override
     protected void paintComponent(Graphics g) {
         super.paintComponent(g);
-//        drawLine(g);
-//        drawRect(g);
-//        drawImage(g);
-//        drawArc(g);
         drawAxis(config,g);
-        drawRoom(g);
+        Room room = new Room(config.getRoom());
+        drawRoom(room,g);
+//        drawTemplate(room,g);
+        drawTemplateAndMove(room,g);
     }
+
+    /**
+     * 画坐标系
+     * @param config
+     * @param g
+     */
     private void drawAxis(Config config,Graphics g){
         Axis axis = new Axis();
         AxisConfig axisConfig = config.getAxisPoint();
@@ -60,176 +65,20 @@ public class MyPanel extends JPanel{
             TemplateUtils.drawTemplate(templateConfig,g);
         }
     }
-    private void drawRoom(Graphics g){
-        Room room = new Room(config.getRoom());
+    private void drawTemplateAndMove(Room room, Graphics g) {
+        List<TemplateConfig> templateList = config.getTemplates();
+        TemplateUtils.setRoom(room);
+        TemplateConfig templateConfig = templateList.get(0);
+        TemplateUtils.drawTemplate(templateConfig,g);
+    }
+    private void drawRoom(Room room, Graphics g){
+
         room.drawSelf(g);
         DoorConfig doorConfig = config.getDoor();
         Door door = new Door();
         door.setConfig(doorConfig);
         door.setRoom(room);
         door.drawSelf(g);
-//        drawTemplate(room,g);
-    }
-    /**
-     * 1. 线段 / 折线
-     */
-    private void drawLine(Graphics g) {
-        frame.setTitle("1. 线段 / 折线");
-
-        // 创建 Graphics 的副本, 需要改变 Graphics 的参数,
-        // 这里必须使用副本, 避免影响到 Graphics 原有的设置
-        Graphics2D g2d = (Graphics2D) g.create();
-
-        // 抗锯齿
-        g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
-        // 设置画笔颜色
-        g2d.setColor(Color.RED);
-
-        // 1. 两点绘制线段: 点(20, 50), 点(200, 50)
-        g2d.drawLine(50, 50, 200, 50);
-
-        // 2. 多点绘制折线: 点(50, 100), 点(100, 130), 点(150, 70), 点(200, 100)
-        int[] xPoints = new int[] { 50, 100, 150, 200 };
-        int[] yPoints = new int[] { 100, 120, 80, 100 };
-        int nPoints = 4;
-        g2d.drawPolyline(xPoints, yPoints, nPoints);
-
-        // 3. 两点绘制线段(设置线宽为5px): 点(50, 150), 点(200, 150)
-        BasicStroke bs1 = new BasicStroke(5);       // 笔画的轮廓(画笔宽度/线宽为5px)
-        g2d.setStroke(bs1);
-        g2d.drawLine(50, 150, 200, 150);
-
-        // 4. 绘制虚线: 将虚线分为若干段( 实线段 和 空白段 都认为是一段), 实线段 和 空白段 交替绘制,
-        //             绘制的每一段(包括 实线段 和 空白段)的 长度 从 dash 虚线模式数组中取值(从首
-        //             元素开始循环取值), 下面数组即表示每段长度分别为: 5px, 10px, 5px, 10px, ...
-        float[] dash = new float[] { 5, 10 };
-        BasicStroke bs2 = new BasicStroke(
-                1,                      // 画笔宽度/线宽
-                BasicStroke.CAP_SQUARE,
-                BasicStroke.JOIN_MITER,
-                10.0f,
-                dash,                   // 虚线模式数组
-                0.0f
-        );
-        g2d.setStroke(bs2);
-        g2d.drawLine(50, 200, 200, 200);
-
-        // 自己创建的副本用完要销毁掉
-        g2d.dispose();
-    }
-
-    /**
-     * 2. 矩形 / 多边形
-     */
-    private void drawRect(Graphics g) {
-        frame.setTitle("2. 矩形 / 多边形");
-        Graphics2D g2d = (Graphics2D) g.create();
-
-        g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
-        g2d.setColor(Color.GRAY);
-
-        // 1. 绘制一个矩形: 起点(30, 20), 宽80, 高100
-        g2d.drawRect(30, 20, 80, 100);
-
-        // 2. 填充一个矩形
-        g2d.fillRect(140, 20, 80, 100);
-
-        // 3. 绘制一个圆角矩形: 起点(30, 150), 宽80, 高100, 圆角宽30, 圆角高30
-        g2d.drawRoundRect(30, 150, 80, 100, 30, 30);
-
-        // 4. 绘制一个多边形(收尾相连): 点(140, 150), 点(180, 250), 点(220, 200)
-        int[] xPoints = new int[] { 140, 180, 220};
-        int[] yPoints = new int[] { 150,  250, 200};
-        int nPoints = 3;
-        g2d.drawPolygon(xPoints, yPoints, nPoints);
-
-        g2d.dispose();
-    }
-
-    /**
-     * 3. 圆弧 / 扇形
-     */
-    private void drawArc(Graphics g) {
-        frame.setTitle("3. 圆弧 / 扇形");
-        Graphics2D g2d = (Graphics2D) g.create();
-
-        g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
-        g2d.setColor(Color.RED);
-
-        // 1. 绘制一条圆弧: 椭圆的外切矩形 左上角坐标为(0, 0), 宽100, 高100,
-        //                弧的开始角度为0度, 需要绘制的角度数为-90度,
-        //                椭圆右边水平线为0度, 逆时针为正角度, 顺时针为负角度
-        g2d.drawArc(0, 0, 100, 100, 0, -90);
-
-        // 2. 绘制一个圆: 圆的外切矩形 左上角坐标为(120, 20), 宽高为100
-        g2d.drawArc(120, 20, 100, 100, 0, 360);
-
-        g2d.setColor(Color.GRAY);
-
-        // 3. 填充一个扇形
-        g2d.fillArc(80, 150, 100, 100, 90, 270);
-
-        g2d.dispose();
-    }
-
-    /**
-     * 4. 椭圆 (实际上通过绘制360度的圆弧/扇形也能达到绘制圆/椭圆的效果)
-     */
-    private void drawOval(Graphics g) {
-        frame.setTitle("4. 椭圆");
-        Graphics2D g2d = (Graphics2D) g.create();
-
-        g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
-        g2d.setColor(Color.RED);
-
-        // 1. 绘制一个圆: 圆的外切矩形 左上角坐标为(0, 0), 宽高为100
-        g2d.drawOval(0, 0, 100, 100);
-
-        g2d.setColor(Color.GRAY);
-
-        // 2. 填充一个椭圆
-        g2d.fillOval(120, 100, 100, 150);
-
-        g2d.dispose();
-    }
-
-    /**
-     * 5. 图片
-     */
-    private void drawImage(Graphics g) {
-        frame.setTitle("5. 图片");
-        Graphics2D g2d = (Graphics2D) g.create();
-
-        // 从本地读取一张图片
-        String filepath = "xs.png";
-        File file = new File(filepath);
-//        System.out.println(file.getAbsolutePath());
-        Image image = Toolkit.getDefaultToolkit().getImage(filepath);
-
-        // 绘制图片(如果宽高传的不是图片原本的宽高, 则图片将会适当缩放绘制)
-        g2d.drawImage(image, 50, 50, image.getWidth(this), image.getHeight(this), this);
-
-        g2d.dispose();
-    }
-
-    /**
-     * 6. 文本
-     */
-    private void drawString(Graphics g) {
-        frame.setTitle("6. 文本");
-        Graphics2D g2d = (Graphics2D) g.create();
-
-        g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
-
-        // 设置字体样式, null 表示使用默认字体, Font.PLAIN 为普通样式, 大小为 25px
-        g2d.setFont(new Font(null, Font.PLAIN, 25));
-
-        // 绘制文本, 其中坐标参数指的是文本绘制后的 左下角 的位置
-        // 首次绘制需要初始化字体, 可能需要较耗时
-        g2d.drawString("Hello World!", 20, 60);
-        g2d.drawString("你好, 世界!", 20, 120);
-
-        g2d.dispose();
     }
 
 

+ 0 - 2
src/main/java/utils/TemplateUtils.java

@@ -16,7 +16,6 @@ import java.awt.*;
 public class TemplateUtils {
     private static Room room;
     private static AxisConfig axisPointConfig;
-
     public static void drawTemplate(TemplateConfig template, Graphics g){
         if(null == room){
             System.out.println("--------------room is not exist !!");
@@ -30,7 +29,6 @@ public class TemplateUtils {
     private static void drawTemplateName(TemplateConfig template, Graphics g) {
         int x1 = room.getX()+template.getX()+template.getLength()/2;
         int y1 = room.getY()+template.getY()+template.getWidth()/2;
-
         g.drawString(template.getName(), x1, y1);
     }
 

+ 1 - 1
src/main/resources/config.yml

@@ -1,5 +1,5 @@
 enlarge: 1
-narrow: 4
+narrow: 6
 axisPoint:
   x: 200
   y: 2500