Skip to content

merge#3

Open
ychen3221 wants to merge 68 commits intoreal-trajectory-yueqiaofrom
main
Open

merge#3
ychen3221 wants to merge 68 commits intoreal-trajectory-yueqiaofrom
main

Conversation

@ychen3221
Copy link
Collaborator

No description provided.

WuJiang5521 and others added 30 commits January 23, 2024 15:15
1. enable auto-layout of some Konva-based components
2. unified the encoding of opacity channel
# Conflicts:
#	src/store/store.js
#	src/utils/theme.js
#	src/views/ContextView/AttentionItem.jsx
#	src/views/ContextView/ContextGroup.jsx
#	src/views/ContextView/contextSortFunctions.js
#	src/views/MapView/Trajectories/RealTrajectoryLayer.jsx
# Conflicts:
#	src/views/ContextView/contextSortFunctions.js
Update store, attentionItem, contextGroup, contextSortFunction, valueDisplay, realTrajectoryLayer
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants