8000 stupid merge conflicts · fastplotlib/fastplotlib@65616b9 · GitHub
[go: up one dir, main page]
Skip to content

Commit 65616b9

Browse files
kushalkolarkushalkolar
committed
stupid merge conflicts
2 parents 5e67318 + 0874498 commit 65616b9

File tree

5 files changed

+10
-5
lines changed

5 files changed

+10
-5
lines changed

‎LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@
186186
same "printed page" as the copyright notice for easier
187187
identification within third-party archives.
188188

189-
Copyright 2025 Kushal Kolar, Caitlin Lewis
189+
Copyright 2022-2026 Kushal Kolar, Caitlin Lewis
190190

191191
Licensed under the Apache License, Version 2.0 (the "License");
192192
you may not use this file except in compliance with the License.

‎README.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ For more detailed information, such as use on cloud computing infrastructure, se
133133

134134
We welcome contributions! See the contributing guide: https://github.com/fastplotlib/fastplotlib/blob/main/CONTRIBUTING.md
135135

136-
You can also take a look at our [**Roadmap for 2025**](https://github.com/fastplotlib/fastplotlib/issues/55) and [**Issues**](https://github.com/fastplotlib/fastplotlib/issues) for ideas on how to contribute!
136+
You can also take a look at our [**Roadmap for 2026**](https://github.com/fastplotlib/fastplotlib/issues/55) and [**Issues**](https://github.com/fastplotlib/fastplotlib/issues) for ideas on how to contribute!
137137

138138
# Developers :brain:
139139

@@ -152,7 +152,8 @@ A special thanks to all of the `pygfx` developers and the amazing work they have
152152
Fastplotlib is free and open source. We would like to thank the following institutions for helping to support fastplotlib over the past few years.
153153

154154
- UNC Chapel Hill, Giovannucci Lab & Hantman Lab
155-
- Flatiron Institute CCN, Chklovskii Lab
155+
- NYU & Flatiron Institute CCN, Williams lab & Chklovskii Lab
156156
- Duke University, Pearson Lab
157+
- Columbia University, Paninski lab
157158

158159
We are always open to new sponsors that can help further develop and improve the library.

‎docs/source/conf.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
# https://www.sphinx-doc.org/en/master/usage/configuration.html#project-information
2727

2828
project = "fastplotlib"
29-
copyright = "2025, Kushal Kolar, Caitlin Lewis"
29+
copyright = "2022-2026, Kushal Kolar, Caitlin Lewis"
3030
author = "Kushal Kolar, Caitlin Lewis"
3131
release = fastplotlib.__version__
3232

‎fastplotlib/graphics/_base.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -317,6 +317,10 @@ def _set_world_object(self, wo: pygfx.WorldObject):
317317
if not all(wo.world.rotation == self.rotation):
318318
self.rotation = self.rotation
319319

320+
# set scale if it's not (1, 1, 1)
321+
if not all(wo.world.scale == self.scale):
322+
self.scale = self.scale
323+
320324
def _add_group_graphic_map(self, wo: pygfx.Group):
321325
# add the children of the group to the WorldObject -> Graphic map
322326
# used by images since they create new WorldObject ImageTiles when a different buffer size is required

‎fastplotlib/layouts/_plot_area.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,7 @@ def map_screen_to_world(
344344
)
345345

346346
# convert screen position to NDC
347-
pos_ndc = (pos_rel[0] / vs[0] * 2 - 1, -(pos_rel[1] / vs[1] * 2 - 1), 0)
347+
pos_ndc = np.asarray([pos_rel[0] / vs[0] * 2 - 1, -(pos_rel[1] / vs[1] * 2 - 1), 0])
348348

349349
# get world position
350350
pos_ndc += vec_transform(self.camera.world.position, self.camera.camera_matrix)

0 commit comments

Comments
 (0)
0