Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix/marker position and ref #1226

Merged
merged 5 commits into from
May 29, 2024
Merged

Fix/marker position and ref #1226

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c48d5ff
fix(marker): fix marker position and ref bad case. fix@visactor/vchar…
skie1997 May 26, 2024
f81c9b8
chore: rush change log
skie1997 May 26, 2024
3fe7949
fix(markline): markline position problem
skie1997 May 27, 2024
a499550
chore: reconfig delta value to constant
skie1997 May 28, 2024
fcfa849
chore: normalize angle with vutil
skie1997 May 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions ...on/changes/@visactor/vrender-components/fix-marker-position-and-ref_2024-05-26-09-16.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"changes": [
{
"packageName": "@visactor/vrender-components",
"comment": "fix(marker): fix marker position and ref bad case. fix@visactor/vchart#2721",
"type": "none"
}
],
"packageName": "@visactor/vrender-components"
}
111 changes: 94 additions & 17 deletions packages/vrender-components/__tests__/browser/examples/mark-point.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,22 @@ export function run() {
itemLineVisible: true,
// itemType: 'text',
itemPos: 'middle',
itemOffsetX: 100,
itemOffsetY: 100,
// itemOffsetX: 100,
// itemOffsetY: 100,
offsetLen: 150,
angleOfOffset: 0,
itemAutoRotate: false,
itemRefX: 10,
itemRefY: 0,
itemRefAngle: 0,
decorativeLineVisible: false,
visible: true,
arcRatio: 0.8
arcRatio: 0.8,
startSymbolRefX: 30,
startSymbolRefY: 0,
endSymbolRefX: 30,
endSymbolRefY: 0,
targetSymbolOffset: 0
};

const styleAttr = {
Expand Down Expand Up @@ -112,13 +119,17 @@ export function run() {
visible: guiObject.decorativeLineVisible
},
startSymbol: {
visible: true,
symbolType: 'triangle'
visible: false,
symbolType: 'triangle',
refX: guiObject.startSymbolRefX,
refY: guiObject.startSymbolRefY
},
endSymbol: {
visible: true,
visible: false,
symbolType: 'triangle',
size: 10,
refX: guiObject.endSymbolRefX,
refY: guiObject.endSymbolRefY,
style: {
fill: 'blue'
}
Expand All @@ -131,8 +142,8 @@ export function run() {
}
},
itemContent: {
offsetX: guiObject.itemOffsetX,
offsetY: guiObject.itemOffsetY,
offsetX: Math.cos((guiObject.angleOfOffset / 180) * Math.PI) * guiObject.offsetLen,
offsetY: Math.sin((guiObject.angleOfOffset / 180) * Math.PI) * guiObject.offsetLen,
refX: guiObject.itemRefX,
refY: guiObject.itemRefY,
refAngle: guiObject.itemRefAngle,
Expand Down Expand Up @@ -221,7 +232,7 @@ export function run() {
},
targetSymbol: {
visible: true,
offset: 10
offset: guiObject.targetSymbolOffset
// style: {
// size: 30,
// // fill: 'red',
Expand Down Expand Up @@ -254,8 +265,8 @@ export function run() {

const markPoint2 = new MarkPoint({
position: {
x: 200,
y: 200
x: 250,
y: 250
},
...(styleAttr as any),
itemContent: {
Expand Down Expand Up @@ -329,22 +340,40 @@ export function run() {
markPoints.forEach(markPoint => markPoint.setAttribute('visible', value, true));
});

gui.add(guiObject, 'itemOffsetX').onChange(value => {
// gui.add(guiObject, 'itemOffsetX').onChange(value => {
// markPoints.forEach(markPoint =>
// markPoint.setAttribute('itemContent', {
// offsetX: value
// })
// );
// console.log('markpoints', markPoints);
// });

// gui.add(guiObject, 'itemOffsetY').onChange(value => {
// markPoints.forEach(markPoint =>
// markPoint.setAttribute('itemContent', {
// offsetY: value
// })
// );
// console.log('markpoints', markPoints);
// });

gui.add(guiObject, 'offsetLen').onChange(value => {
markPoints.forEach(markPoint =>
markPoint.setAttribute('itemContent', {
offsetX: value
offsetX: value * Math.cos((guiObject.angleOfOffset / 180) * Math.PI),
offsetY: value * Math.sin((guiObject.angleOfOffset / 180) * Math.PI)
})
);
console.log('markpoints', markPoints);
});

gui.add(guiObject, 'itemOffsetY').onChange(value => {
gui.add(guiObject, 'angleOfOffset', 0, 360).onChange(value => {
markPoints.forEach(markPoint =>
markPoint.setAttribute('itemContent', {
offsetY: value
offsetX: guiObject.offsetLen * Math.cos((value / 180) * Math.PI),
offsetY: guiObject.offsetLen * Math.sin((value / 180) * Math.PI)
})
);
console.log('markpoints', markPoints);
});

gui.add(guiObject, 'itemAutoRotate').onChange(value => {
Expand All @@ -371,6 +400,46 @@ export function run() {
);
});

gui.add(guiObject, 'startSymbolRefX').onChange(value => {
markPoints.forEach(markPoint =>
markPoint.setAttribute('itemLine', {
startSymbol: {
refX: value
}
})
);
});

gui.add(guiObject, 'startSymbolRefY').onChange(value => {
markPoints.forEach(markPoint =>
markPoint.setAttribute('itemLine', {
startSymbol: {
refY: value
}
})
);
});

gui.add(guiObject, 'endSymbolRefX').onChange(value => {
markPoints.forEach(markPoint =>
markPoint.setAttribute('itemLine', {
endSymbol: {
refX: value
}
})
);
});

gui.add(guiObject, 'endSymbolRefY').onChange(value => {
markPoints.forEach(markPoint =>
markPoint.setAttribute('itemLine', {
endSymbol: {
refY: value
}
})
);
});

gui.add(guiObject, 'itemRefAngle').onChange(value => {
markPoints.forEach(markPoint =>
markPoint.setAttribute('itemContent', {
Expand All @@ -396,4 +465,12 @@ export function run() {
})
);
});

gui.add(guiObject, 'targetSymbolOffset').onChange(value => {
markPoints.forEach(markPoint =>
markPoint.setAttribute('targetSymbol', {
offset: value
})
);
});
}
4 changes: 3 additions & 1 deletion packages/vrender-components/src/marker/common-line.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,9 @@ export abstract class MarkCommonLine<LineAttr, LabelPosition> extends Marker<
const { label = {}, limitRect } = this.attribute;
const { position, confine, autoRotate } = label;
const labelPoint = this.getPointAttrByPosition(position);
const labelAngle = this._line.getEndAngle() || 0;
const labelAngle = position.toString().toLocaleLowerCase().includes('start')
? this._line.getStartAngle() || 0
: this._line.getEndAngle() || 0;
this._label.setAttributes({
...labelPoint.position,
angle: autoRotate ? this.getRotateByAngle(labelPoint.angle) : 0,
Expand Down
27 changes: 9 additions & 18 deletions packages/vrender-components/src/marker/line.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { DEFAULT_STATES } from '../constant';
import { DEFAULT_CARTESIAN_MARK_LINE_TEXT_STYLE_MAP, DEFAULT_MARK_LINE_THEME } from './config';
import type { ILineGraphicAttribute } from '@visactor/vrender-core';
import { markCommonLineAnimate } from './animate/animate';
import { isPostiveXAxisCartes } from '../util';
import { fuzzyEqualNumber, getTextAlignAttrOfVerticalDir, isPostiveXAxis } from '../util';

loadMarkLineComponent();

Expand Down Expand Up @@ -43,7 +43,7 @@ export class MarkLine extends MarkCommonLine<ILineGraphicAttribute, IMarkLineLab
const { refX = 0, refY = 0 } = label;
const points = this._line.getMainSegmentPoints();
const lineEndAngle = this._line.getEndAngle() ?? 0;
const labelAngle = isPostiveXAxisCartes(lineEndAngle) ? lineEndAngle : lineEndAngle;
const labelAngle = isPostiveXAxis(lineEndAngle) ? lineEndAngle : lineEndAngle;

const labelOffsetX = refX * Math.cos(labelAngle) + refY * Math.cos(labelAngle - Math.PI / 2);
const labelOffsetY = refX * Math.sin(labelAngle) + refY * Math.sin(labelAngle - Math.PI / 2);
Expand Down Expand Up @@ -75,29 +75,20 @@ export class MarkLine extends MarkCommonLine<ILineGraphicAttribute, IMarkLineLab
}

protected getRotateByAngle(angle: number): number {
const itemAngle = isPostiveXAxisCartes(angle) ? angle : angle - Math.PI;
const itemAngle = isPostiveXAxis(angle) ? angle : angle - Math.PI;
return itemAngle + (this.attribute.label.refAngle ?? 0);
}

protected getTextStyle(position: IMarkLineLabelPosition, labelAngle: number, autoRotate: boolean) {
// 垂直方向例外
if (Math.abs(Math.abs(labelAngle) - Math.PI / 2) < 0.0001) {
if (autoRotate) {
return {
textAlign: 'right',
textBaseline: 'middle'
};
}
return {
textAlign: 'center',
textBaseline:
(labelAngle > 0 && position.includes('inside')) || (labelAngle < 0 && !position.includes('inside'))
? 'bottom'
: 'top'
};
if (
fuzzyEqualNumber(Math.abs(labelAngle), Math.PI / 2, 0.0001) ||
fuzzyEqualNumber(Math.abs(labelAngle), (Math.PI * 3) / 2, 0.0001)
) {
return getTextAlignAttrOfVerticalDir(autoRotate, labelAngle, position);
}

if (isPostiveXAxisCartes(labelAngle)) {
if (isPostiveXAxis(labelAngle)) {
return DEFAULT_CARTESIAN_MARK_LINE_TEXT_STYLE_MAP.postiveXAxis[position];
}
return DEFAULT_CARTESIAN_MARK_LINE_TEXT_STYLE_MAP.negativeXAxis[position];
Expand Down
Loading
Loading