Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
frontend
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Jira
External wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
minerva
frontend
Commits
20f3c4ef
Commit
20f3c4ef
authored
6 months ago
by
Miłosz Grocholewski
Browse files
Options
Downloads
Patches
Plain Diff
feat(vector-map): add shape option for modelElementSchema
parent
ad4c9c00
No related branches found
No related tags found
4 merge requests
!271
Resolve MIN-39 "Feat/ glyphs"
,
!265
feat(vector-map): add drawer to control individual layers + add support for text layer
,
!261
feat(vector-map): add support for homomultimer option
,
!260
feat(vector-map): add drawing compartments
Pipeline
#96305
passed
6 months ago
Stage: lint
Stage: prettier
Stage: test
Changes
2
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/components/Map/MapViewer/MapViewerVector/utils/config/reactionsLayer/useOlMapReactionsLayer.ts
+4
-2
4 additions, 2 deletions
...tor/utils/config/reactionsLayer/useOlMapReactionsLayer.ts
src/models/modelElementSchema.ts
+1
-1
1 addition, 1 deletion
src/models/modelElementSchema.ts
with
5 additions
and
3 deletions
src/components/Map/MapViewer/MapViewerVector/utils/config/reactionsLayer/useOlMapReactionsLayer.ts
+
4
−
2
View file @
20f3c4ef
...
...
@@ -62,6 +62,7 @@ export const useOlMapReactionsLayer = ({
nameVerticalAlign
:
element
.
nameVerticalAlign
as
VerticalAlign
,
nameHorizontalAlign
:
element
.
nameHorizontalAlign
as
HorizontalAlign
,
text
:
element
.
name
,
fontSize
:
element
.
fontSize
,
pointToProjection
,
mapInstance
,
modifications
:
element
.
modificationResidues
,
...
...
@@ -89,12 +90,13 @@ export const useOlMapReactionsLayer = ({
nameVerticalAlign
:
element
.
nameVerticalAlign
as
VerticalAlign
,
nameHorizontalAlign
:
element
.
nameHorizontalAlign
as
HorizontalAlign
,
text
:
element
.
name
,
fontSize
:
element
.
fontSize
,
pointToProjection
,
mapInstance
,
};
if
(
element
.
compartmentType
===
'
CIRCLE
'
)
{
if
(
element
.
shape
===
'
OVAL_COMPARTMENT
'
)
{
validElements
.
push
(
new
CompartmentCircle
(
compartmentProps
));
}
else
{
}
else
if
(
element
.
shape
===
'
SQUARE_COMPARTMENT
'
)
{
validElements
.
push
(
new
CompartmentSquare
(
compartmentProps
));
}
}
...
...
This diff is collapsed.
Click to expand it.
src/models/modelElementSchema.ts
+
1
−
1
View file @
20f3c4ef
...
...
@@ -40,7 +40,7 @@ export const modelElementSchema = z.object({
innerWidth
:
z
.
number
().
optional
(),
outerWidth
:
z
.
number
().
optional
(),
thickness
:
z
.
number
().
optional
(),
compartmentTy
pe
:
z
.
enum
([
'
SQUARE
'
,
'
CIRCLE
'
]).
optional
(),
sha
pe
:
z
.
enum
([
'
SQUARE
_COMPARTMENT
'
,
'
OVAL_COMPARTMENT
'
,
'
PATHWAY
'
]).
optional
(),
complex
:
z
.
number
().
nullable
().
optional
(),
initialAmount
:
z
.
number
().
nullable
().
optional
(),
charge
:
z
.
number
().
nullable
().
optional
(),
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment