Merge remote-tracking branch 'origin/master'

4dkankan-utils-dxf/src/main/java/com/fdkankan/dxf/parse/utils/LaserMeterToDxfUtil.java

@@ -115,16 +115,22 @@ public class LaserMeterToDxfUtil {
         pointSet.add(startPoint);
         pointSet.add(endPoint);
         drawLinePoint(startPoint,endPoint,dxfDocWriter);
-        BigDecimal bigDecimal = BigDecimal.valueOf(distanceTo(point3d1, point3d2) * 100).setScale(5, RoundingMode.UP);
-        int d = bigDecimal.divide(new BigDecimal(100),2, RoundingMode.UP).intValue();
+        BigDecimal bigDecimal = BigDecimal.valueOf(distanceTo(point3d1, point3d2) ).setScale(4, RoundingMode.UP);
         DxfText dxfText = new DxfText();
-        Vector3 vector3 = new Vector3((endPoint.getX() + startPoint.getX()) /2 ,
-                (endPoint.getY() + startPoint.getY() )/2 ,
-                0);
+
+//        Double x = (endPoint.getX() + startPoint.getX()) / 2  ;
+//        Double y = (endPoint.getY() + startPoint.getY()) / 2;
+//        double px = (2 * startPoint.getX() + endPoint.getX()) / 3;
+//        double py = (2 * startPoint.getY() + endPoint.getY()) / 3;
+
+        double px = startPoint.getX() + (2.0/5.0) * (endPoint.getX() - startPoint.getX());
+        double py = startPoint.getY() + (2.0/5.0) * (endPoint.getY() - startPoint.getY());
+
+        Vector3 vector3 = new Vector3(px   , py  , 0);
         dxfText.setStartPoint(vector3);
-        dxfText.setText(bigDecimal.toString()+"cm");
+        dxfText.setText(bigDecimal.toString()+"m");
         dxfText.setAngle(angleBetween(startPoint,endPoint));
-        dxfText.setHigh(d *2);
+        dxfText.setHigh(bigDecimal.doubleValue() * 2);
         dxfText.setColor(new Color(255,255,255));
         dxfDocWriter.addEntity(dxfText);
     }