Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Support adding text labels to lines and shapes#6454

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.

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

Already on GitHub?Sign in to your account

Merged
emilykl merged 86 commits intomasterfromadd-text-to-shapes
Mar 10, 2023
Merged
Show file tree
Hide file tree
Changes from1 commit
Commits
Show all changes
86 commits
Select commitHold shift + click to select a range
7ee2e85
add attributes for text on shapes
emilyklNov 17, 2022
932fa65
draw text, but not in the right place
emilyklNov 17, 2022
1d0e471
draw text in correct place, when x0 and y0 are defined for shape
emilyklJan 9, 2023
e46e1bc
update shape label api
emilyklJan 9, 2023
60823dc
implement xanchor
emilyklJan 10, 2023
2f8c810
add image test
emilyklJan 10, 2023
e405293
fix xanchor bug
emilyklJan 10, 2023
e31de9e
partial handling of re-render
emilyklJan 10, 2023
0bcfff3
handle numeric angles
emilyklJan 10, 2023
9972dc9
handle auto angle for lines, put label drawing code into func
emilyklJan 10, 2023
6d5709a
nicer colors on image test
emilyklJan 11, 2023
072edf6
fix weird behavior on pan
emilyklJan 11, 2023
8bee979
disable mathjax rendering for shape text
emilyklJan 11, 2023
8528561
clip shape text outside plot area
emilyklJan 11, 2023
b4a4576
fix textangle bug for lines -- angle should always be correct now
emilyklJan 23, 2023
97ee8c4
correctly handle position prop in most cases
emilyklJan 23, 2023
674abd8
revert shapes demo to original
emilyklJan 23, 2023
3743de4
handle label font
emilyklJan 23, 2023
c3cc5ed
redraw text during shape move/resize
emilyklJan 26, 2023
45a0564
handle yanchor for text
emilyklJan 27, 2023
b8085c2
rename mock
emilyklJan 27, 2023
8c0476e
handle multiline text and support text on arbitrary paths (sort of)
emilyklJan 27, 2023
95dd9b6
fix jasmine tests... maybe
emilyklJan 27, 2023
58e39cb
update plot-schema.json
emilyklJan 30, 2023
488318f
add data-index attr to shape group
emilyklJan 30, 2023
c8d20f2
update jasmine test
emilyklJan 30, 2023
dad6ea5
add mocks for text on shapes
emilyklJan 30, 2023
3134869
fix mocks
emilyklJan 30, 2023
f17e218
add image baselines
emilyklJan 30, 2023
01ef185
fix text positioning for lines
emilyklFeb 16, 2023
d8c4790
Apply suggestions from code review
emilyklJan 31, 2023
5f39a62
rename position to textposition, fix some defaults
emilyklFeb 20, 2023
1ab9e24
fix docstrings for xanchor and yanchor
emilyklFeb 20, 2023
b9ea251
updated plot-schema.json
emilyklFeb 20, 2023
1f366a8
updated image baselines
emilyklFeb 20, 2023
f1087f3
updated plot-schema.json
emilyklFeb 21, 2023
f1570cf
fix Jasmine tests in shapes_test.js
emilyklFeb 21, 2023
baec66d
revert dist/plot-schema.json
emilyklFeb 21, 2023
d83e0cd
update textangle docstring and fix edge case
emilyklFeb 21, 2023
a91d12f
remove label dflt
emilyklFeb 21, 2023
4948d67
Update src/components/shapes/draw.js
emilyklFeb 23, 2023
a5e19d3
Update src/components/shapes/draw.js
emilyklFeb 23, 2023
e55953e
add new mock
emilyklFeb 24, 2023
44d5f08
fix text position for paths
emilyklFeb 28, 2023
5424ac5
fix mock
emilyklFeb 28, 2023
8769cff
add label attributes to newshape (broken)
emilyklFeb 28, 2023
f192a16
adjust edit types for newshape.label
archmojFeb 28, 2023
7ca5cf8
fix syntax in zz-text_on_shapes_reversed_axes mock
archmojFeb 28, 2023
822fe0d
add baseline
archmojFeb 28, 2023
d50da33
fix circular dependency
archmojMar 1, 2023
8cec651
set newshape label editType
archmojMar 1, 2023
36771a8
change default xanchor and yanchor behavior
emilyklMar 1, 2023
3f9727a
update mocks
emilyklMar 1, 2023
9a4a121
Merge branch 'add-text-to-shapes' of https://github.com/plotly/plotly…
emilyklMar 1, 2023
e493873
validate new mock
archmojMar 1, 2023
a17a315
update yanchor values and defaults in draw_newshape
emilyklMar 1, 2023
d9bef04
Merge branch 'add-text-to-shapes' of https://github.com/plotly/plotly…
emilyklMar 1, 2023
f54f102
input newshape label attributes
archmojMar 1, 2023
f642a52
draw labels on new shapes
archmojMar 1, 2023
dfb608e
provide missing editTypes
archmojMar 1, 2023
c20370a
merge shapes/defaults.js
emilyklMar 1, 2023
feb2f38
standardize default yanchor behavior between shape and draw_newshape
emilyklMar 1, 2023
11b3421
better docstrings for xanchor and yanchor
emilyklMar 1, 2023
ea9493e
update image baselines
emilyklMar 1, 2023
52463fa
update plot-schema
emilyklMar 1, 2023
394b48f
improve label.textposition docstring
emilyklMar 2, 2023
1325b7c
only coerce label properties if label text is given
emilyklMar 2, 2023
63bb5d9
fix line xanchor behavior when x0 == x1
emilyklMar 2, 2023
61e3df7
docstring update
emilyklMar 2, 2023
40933d0
update plot-schema
emilyklMar 2, 2023
8d35f6e
set default angle to auto for all shapes
emilyklMar 2, 2023
d5d1927
set min padding to 0
emilyklMar 2, 2023
c34d6de
update plot-schema
emilyklMar 2, 2023
ffea962
docstring: specify padding is in px
emilyklMar 6, 2023
ebe85c4
calculate textangle sin and cos only once
emilyklMar 6, 2023
d113bcf
docstring updates
emilyklMar 6, 2023
c703c11
simplify dfltYanchor implementation
emilyklMar 6, 2023
468363e
change temp render logic
emilyklMar 9, 2023
cdf2d37
update shape label while editing an editable shape
archmojMar 8, 2023
9eb7c90
test label behavior for draw_newshape
emilyklMar 9, 2023
3d2c792
update docstring formatting
emilyklMar 9, 2023
394555c
update plot-schema
emilyklMar 9, 2023
eaf270d
add draft log
emilyklMar 9, 2023
095561f
update draft log
emilyklMar 9, 2023
b0b8ab1
Merge branch 'master' into add-text-to-shapes
emilyklMar 10, 2023
d927b6a
run linter
emilyklMar 10, 2023
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
PrevPrevious commit
NextNext commit
update shape label api
  • Loading branch information
@emilykl
emilykl committedFeb 20, 2023
commite46e1bc2ba865f2ec7e4ce8ca3ef297da22bcd65
60 changes: 41 additions & 19 deletionssrc/components/shapes/attributes.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
'use strict';

var annAttrs = require('../annotations/attributes');
var fontAttrs = require('../../plots/font_attributes');
var scatterLineAttrs = require('../../traces/scatter/attributes').line;
var dash = require('../drawing/attributes').dash;
var extendFlat = require('../../lib/extend').extendFlat;
Expand DownExpand Up@@ -224,26 +225,47 @@ module.exports = templatedArray('shape', {
'`config.editable` or `config.edits.shapePosition`.'
].join(' ')
},
text: {
valType: 'string',
label: {
text: {
valType: 'string',
dflt: null,
editType: 'arraydraw',
description: 'Sets the text to display with shape.'
},
font: fontAttrs({
editType: 'calc+arraydraw',
colorEditType: 'arraydraw',
description: 'Sets the shape label text font.'
}),
position: {
valType: 'enumerated',
values: [
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

It looks like we need to haveautodflt andvalue in respect tosrc/components/shapes/defaults.js logic.

Copy link
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

@archmoj What would be the use case for anauto value fortextposition?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

@archmoj What would be the use case for anauto value fortextposition?

Hmm.. that's a good idea. But as far as I recall we don't have such an option fortextposition in other places. So perhaps we could keep this part as is.

'top left', 'top center', 'top right',
'middle left', 'middle center', 'middle right',
'bottom left', 'bottom center', 'bottom right'
],
dflt: 'top left',
editType: 'arraydraw',
description: 'Sets the position of the label relative to she shape.'
},
angle: {
valType: 'number',
min: -180,
max: 180,
dflt: 0,
editType: 'arraydraw',
description: 'Sets label angle.'
},
xanchor: annAttrs.xanchor,
yanchor: annAttrs.yanchor,
padding: {
valType: 'number',
dflt: 0,
editType: 'arraydraw',
description: 'Sets padding between edge of label and xanchor / yanchor.'
},
dflt: null,
editType: 'arraydraw',
description: 'Sets the text to display with shape.'
},
textposition: {
valType: 'enumerated',
values: ['center', 'topleft', 'topright', 'bottomleft', 'bottomright'],
dflt: 'center',
editType: 'arraydraw',
description: 'Sets text position relative to shape.'
},
textangle: {
valType: 'number',
min: -180,
max: 180,
dflt: 0,
editType: 'arraydraw',
description: 'Sets text angle.'
editType: 'arraydraw'
},
editType: 'arraydraw'
});
2 changes: 1 addition & 1 deletionsrc/components/shapes/defaults.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -40,7 +40,7 @@ function handleShapeDefaults(shapeIn, shapeOut, fullLayout) {
coerce('line.dash');
}

coerce('text');
coerce('label.text');

var xSizeMode = coerce('xsizemode');
var ySizeMode = coerce('ysizemode');
Expand Down
5 changes: 4 additions & 1 deletionsrc/components/shapes/draw.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -143,7 +143,10 @@ function drawOne(gd, index) {

setClipPath(path, gd, options);

var text = options.text;
var text = null;
if(options.label) {
text = options.label.text;
}
console.log('text!');
console.log(text);

Expand Down
26 changes: 13 additions & 13 deletionstest/image/mocks/shapes.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,19 +21,19 @@
"margin": {"l":20,"r":20,"pad":0},
"showlegend":false,
"shapes":[
{"text":"hello world0", "layer":"below","xref":"paper","yref":"paper","x0":0,"x1":0.1,"y0":0,"y1":0.1},
{"text":"hello world1", "xref":"paper","yref":"paper","path":"M0,0.2V0.3H0.05L0,0.4Q0.1,0.4 0.1,0.3T0.15,0.3C0.1,0.4 0.2,0.4 0.2,0.3S0.15,0.3 0.15,0.2Z","fillcolor":"#4c0"},
{"text":"hello world2", "xref":"paper","yref":"paper","type":"circle","x0":0.23,"x1":0.3,"y0":0.2,"y1":0.4},
{"text":"hello world3", "xref":"paper","yref":"paper","type":"line","x0":0.2,"x1":0.3,"y0":0,"y1":0.1},
{"text":"hello world4", "layer":"below","x0":0.1,"x1":0.4,"y0":1.5,"y1":20,"opacity":0.5,"fillcolor":"#f00","line":{"width":8,"color":"#008","dash":"dashdot"}},
{"text":"hello world5", "path":"M0.5,3C0.5,9 0.9,9 0.9,3C0.9,1 0.5,1 0.5,3ZM0.6,4C0.6,5 0.66,5 0.66,4ZM0.74,4C0.74,5 0.8,5 0.8,4ZM0.6,3C0.63,2 0.77,2 0.8,3Z","fillcolor":"#fd2","line":{"width":1,"color":"black"}},
{"text":"hello world6", "layer":"below","xref":"x2","yref":"y2","type":"circle","x0":"2000-01-01 02","x1":"2000-01-01 08:30:33.456","y0":0.1,"y1":0.9,"fillcolor":"rgba(0,0,0,0.5)","line":{"color":"rgba(0,255,0,0.5)", "width":5}},
{"text":"hello world7", "xref":"x2","yref":"y2","path":"M2000-01-01_11:20:45.6,0.2Q2000-01-01_10:00,0.85 2000-01-01_21,0.8Q2000-01-01_22:20,0.15 2000-01-01_11:20:45.6,0.2Z","fillcolor":"rgb(151,73,58)"},
{"text":"hello world8", "xref":"x2","yref":"y2","type":"line","x0":"2000-01-01 11:00","x1":"2000-01-01 09:00","y0":"b","y1":"a","line":{"color":"#006","width":3}},
{"text":"hello world9", "yref":"paper","type":"line","x0":0.1,"x1":0.4,"y0":0,"y1":0.4,"line":{"color":"#009","dash":"dot","width":1}},
{"text":"hello world 10", "yref":"paper","path":"M0.5,0H1.1L0.8,0.4Z","line":{"width":0},"fillcolor":"#ccd3ff"},
{"text":"hello world 11", "xref":"paper","x0":0.1,"x1":0.2,"y0":-1,"y1":3,"fillcolor":"#ccc"},
{"text":"hello world 12", "layer":"above","xref":"paper","path":"M0.05,4C0.4,12 -0.1,12 0.25,4Z","fillcolor":"#a66"}
{"label":{"text":"hello world00"}, "layer":"below","xref":"paper","yref":"paper","x0":0,"x1":0.1,"y0":0,"y1":0.1},
{"label":{"text":"hello world01"}, "xref":"paper","yref":"paper","path":"M0,0.2V0.3H0.05L0,0.4Q0.1,0.4 0.1,0.3T0.15,0.3C0.1,0.4 0.2,0.4 0.2,0.3S0.15,0.3 0.15,0.2Z","fillcolor":"#4c0"},
{"label":{"text":"hello world02"}, "xref":"paper","yref":"paper","type":"circle","x0":0.23,"x1":0.3,"y0":0.2,"y1":0.4},
{"label":{"text":"hello world03"}, "xref":"paper","yref":"paper","type":"line","x0":0.2,"x1":0.3,"y0":0,"y1":0.1},
{"label":{"text":"hello world04"}, "layer":"below","x0":0.1,"x1":0.4,"y0":1.5,"y1":20,"opacity":0.5,"fillcolor":"#f00","line":{"width":8,"color":"#008","dash":"dashdot"}},
{"label":{"text":"hello world05"}, "path":"M0.5,3C0.5,9 0.9,9 0.9,3C0.9,1 0.5,1 0.5,3ZM0.6,4C0.6,5 0.66,5 0.66,4ZM0.74,4C0.74,5 0.8,5 0.8,4ZM0.6,3C0.63,2 0.77,2 0.8,3Z","fillcolor":"#fd2","line":{"width":1,"color":"black"}},
{"label":{"text":"hello world06"}, "layer":"below","xref":"x2","yref":"y2","type":"circle","x0":"2000-01-01 02","x1":"2000-01-01 08:30:33.456","y0":0.1,"y1":0.9,"fillcolor":"rgba(0,0,0,0.5)","line":{"color":"rgba(0,255,0,0.5)", "width":5}},
{"label":{"text":"hello world07"}, "xref":"x2","yref":"y2","path":"M2000-01-01_11:20:45.6,0.2Q2000-01-01_10:00,0.85 2000-01-01_21,0.8Q2000-01-01_22:20,0.15 2000-01-01_11:20:45.6,0.2Z","fillcolor":"rgb(151,73,58)"},
{"label":{"text":"hello world08"}, "xref":"x2","yref":"y2","type":"line","x0":"2000-01-01 11:00","x1":"2000-01-01 09:00","y0":"b","y1":"a","line":{"color":"#006","width":3}},
{"label":{"text":"hello world09"}, "yref":"paper","type":"line","x0":0.1,"x1":0.4,"y0":0,"y1":0.4,"line":{"color":"#009","dash":"dot","width":1}},
{"label":{"text":"hello world 10"}, "yref":"paper","path":"M0.5,0H1.1L0.8,0.4Z","line":{"width":0},"fillcolor":"#ccd3ff"},
{"label":{"text":"hello world 11"}, "xref":"paper","x0":0.1,"x1":0.2,"y0":-1,"y1":3,"fillcolor":"#ccc"},
{"label":{"text":"hello world 12"}, "layer":"above","xref":"paper","path":"M0.05,4C0.4,12 -0.1,12 0.25,4Z","fillcolor":"#a66"}
]
}
}
[8]ページ先頭
©2009-2025 Movatter.jp