Skip to content

Commit c95edc5

Browse files
authored
Merge pull request #370 from Dessia-tech/fix/mpl-plot-colors
Fix LineSegment edge_style when using mpl_plot
2 parents 47da5a5 + b88afeb commit c95edc5

2 files changed

Lines changed: 11 additions & 10 deletions

File tree

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
99
### Add
1010
- Allow to directly specify if axes are on or off in Python
1111

12+
### Fix
13+
- LineSegment2D : If it is overloaded, MPL Plot now show the right edge_style instead of generating of random one
14+
15+
1216
## [0.23.0]
1317
### Feat
1418
- Add events (Subject) to emit shape hovering and clicking

plot_data/core.py

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,6 @@ def mpl_plot(self, ax=None, edge_style=None, **kwargs):
503503
if ax is None:
504504
_, ax = plt.subplots()
505505

506-
style = self.edge_style
507506
if edge_style:
508507
style = edge_style
509508
color = style.color_stroke.rgb
@@ -534,9 +533,8 @@ def __init__(self, point1: List[float], point2: List[float], edge_style: EdgeSty
534533
self.point2 = point2
535534

536535
if edge_style is None:
537-
self.edge_style = EdgeStyle()
538-
else:
539-
self.edge_style = edge_style
536+
edge_style = EdgeStyle()
537+
self.edge_style = edge_style
540538
super().__init__(type_='linesegment2d', reference_path=reference_path, tooltip=tooltip, name=name)
541539

542540
def bounding_box(self):
@@ -555,10 +553,11 @@ def mpl_plot(self, ax=None, edge_style=None, **kwargs):
555553
if not ax:
556554
_, ax = plt.subplots()
557555

558-
if edge_style:
559-
edge_style = self.edge_style
560-
else:
561-
edge_style = DEFAULT_EDGESTYLE
556+
if edge_style is None:
557+
if self.edge_style:
558+
edge_style = self.edge_style
559+
else:
560+
edge_style = DEFAULT_EDGESTYLE
562561

563562
ax.plot([self.point1[0], self.point2[0]], [self.point1[1], self.point2[1]], **edge_style.mpl_arguments(),
564563
**kwargs)
@@ -635,7 +634,6 @@ def mpl_plot(self, ax=None, **kwargs):
635634
edge_style = self.edge_style
636635
else:
637636
edge_style = DEFAULT_EDGESTYLE
638-
# dashes = DEFAULT_EDGESTYLE.dashline
639637
args = edge_style.mpl_arguments(surface=True)
640638
if 'dashes' in args:
641639
args.pop("dashes")
@@ -676,7 +674,6 @@ def mpl_plot(self, ax=None, **kwargs):
676674
edge_style = self.edge_style
677675
else:
678676
edge_style = DEFAULT_EDGESTYLE
679-
# dashes = DEFAULT_EDGESTYLE.dashline
680677
args = edge_style.mpl_arguments(surface=True)
681678
if 'dashes' in args:
682679
args.pop("dashes")

0 commit comments

Comments
 (0)