|
@@ -45,7 +45,7 @@ import { Line } from "konva/lib/shapes/Line";
|
|
|
import { DrawItem } from "../components";
|
|
import { DrawItem } from "../components";
|
|
|
import { PolygonData } from "../components/polygon";
|
|
import { PolygonData } from "../components/polygon";
|
|
|
import { getBaseItem } from "../components/util";
|
|
import { getBaseItem } from "../components/util";
|
|
|
-import { defaultStyle as defaultArrowStyle } from '../components/arrow'
|
|
|
|
|
|
|
+import { defaultStyle as defaultArrowStyle } from "../components/arrow";
|
|
|
|
|
|
|
|
export const useGetDXF = () => {
|
|
export const useGetDXF = () => {
|
|
|
const store = useStore();
|
|
const store = useStore();
|
|
@@ -245,8 +245,12 @@ export const useGetDXF = () => {
|
|
|
await asyncTimeout(50);
|
|
await asyncTimeout(50);
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
- const drawItem = async (_item: DrawItem, type = store.getType(_item.id)) => {
|
|
|
|
|
|
|
+ const drawItem = async (
|
|
|
|
|
+ _item: DrawItem,
|
|
|
|
|
+ type = store.getType(_item.id),
|
|
|
|
|
+ ) => {
|
|
|
if (_item.hide) return;
|
|
if (_item.hide) return;
|
|
|
|
|
+ const iconScale = 8;
|
|
|
let item;
|
|
let item;
|
|
|
let mat;
|
|
let mat;
|
|
|
switch (type) {
|
|
switch (type) {
|
|
@@ -331,18 +335,18 @@ export const useGetDXF = () => {
|
|
|
points: linePoints,
|
|
points: linePoints,
|
|
|
attitude: new Transform().m,
|
|
attitude: new Transform().m,
|
|
|
};
|
|
};
|
|
|
- await drawItem(lineData, 'polygon');
|
|
|
|
|
|
|
+ await drawItem(lineData, "polygon");
|
|
|
}
|
|
}
|
|
|
const arrowData: ArrowData = {
|
|
const arrowData: ArrowData = {
|
|
|
...getBaseItem(),
|
|
...getBaseItem(),
|
|
|
...defaultArrowStyle,
|
|
...defaultArrowStyle,
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
...item,
|
|
...item,
|
|
|
points: points.slice(points.length - 2),
|
|
points: points.slice(points.length - 2),
|
|
|
attitude: new Transform().m,
|
|
attitude: new Transform().m,
|
|
|
};
|
|
};
|
|
|
- console.log(arrowData)
|
|
|
|
|
- await drawItem(arrowData, 'arrow')
|
|
|
|
|
|
|
+ console.log(arrowData);
|
|
|
|
|
+ await drawItem(arrowData, "arrow");
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
break;
|
|
break;
|
|
@@ -434,10 +438,13 @@ export const useGetDXF = () => {
|
|
|
.findOne<Group>(`#${iconItem.id}`)!
|
|
.findOne<Group>(`#${iconItem.id}`)!
|
|
|
.findOne<Group>(".rep-position")!;
|
|
.findOne<Group>(".rep-position")!;
|
|
|
|
|
|
|
|
- await writeImage(pathGroup, () => {
|
|
|
|
|
|
|
+ await writeImage(pathGroup, (scale) => {
|
|
|
|
|
+ const oldSW = iconItem.strokeWidth;
|
|
|
|
|
+ iconItem.strokeWidth = (iconItem.strokeWidth || 1) * scale.width * 1.5;
|
|
|
iconItem.strokeScaleEnabled = true;
|
|
iconItem.strokeScaleEnabled = true;
|
|
|
return () => {
|
|
return () => {
|
|
|
iconItem.strokeScaleEnabled = false;
|
|
iconItem.strokeScaleEnabled = false;
|
|
|
|
|
+ iconItem.strokeWidth = oldSW;
|
|
|
};
|
|
};
|
|
|
});
|
|
});
|
|
|
break;
|
|
break;
|
|
@@ -447,10 +454,15 @@ export const useGetDXF = () => {
|
|
|
.findOne<Group>(`#${lineIconItem.id}`)!
|
|
.findOne<Group>(`#${lineIconItem.id}`)!
|
|
|
.findOne<Group>(".rep-position")!;
|
|
.findOne<Group>(".rep-position")!;
|
|
|
|
|
|
|
|
- await writeImage(linePathGroup, () => {
|
|
|
|
|
|
|
+ await writeImage(linePathGroup, (scale) => {
|
|
|
|
|
+ const oldSW = lineIconItem.strokeWidth;
|
|
|
|
|
+ lineIconItem.strokeWidth =
|
|
|
|
|
+ (lineIconItem.strokeWidth || 1) * scale.width* 1.5;
|
|
|
lineIconItem.strokeScaleEnabled = true;
|
|
lineIconItem.strokeScaleEnabled = true;
|
|
|
|
|
+ // lineIconItem.stroke
|
|
|
return () => {
|
|
return () => {
|
|
|
lineIconItem.strokeScaleEnabled = false;
|
|
lineIconItem.strokeScaleEnabled = false;
|
|
|
|
|
+ lineIconItem.strokeWidth = oldSW;
|
|
|
};
|
|
};
|
|
|
});
|
|
});
|
|
|
break;
|
|
break;
|