-
Notifications
You must be signed in to change notification settings - Fork 82
silx.gui.plot3d: Global size parameters now scales symbols with array sizes #4539
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 our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
loichuder
wants to merge
1
commit into
main
Choose a base branch
from
scatter3d-size-scaling
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -171,6 +171,7 @@ class SymbolMixIn(_SymbolMixIn): | |
| def __init__(self): | ||
| super().__init__() | ||
| self.__primitive = None | ||
| self.__scaleFactor = 1 | ||
|
|
||
| def _setPrimitive(self, primitive: primitives.Points): | ||
| """Set the scene primitive on which to set the symbol and size""" | ||
|
|
@@ -193,12 +194,16 @@ def setSymbolSize(self, size: float | ArrayLike | None, copy: bool = True): | |
| super().setSymbolSize(size, copy) | ||
| self._syncPointsPrimitive() | ||
|
|
||
| def setSizeScaleFactor(self, scaleFactor: float): | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I propose to name it Can you add a getter for it as well? |
||
| self.__scaleFactor = scaleFactor | ||
| self._syncPointsPrimitive() | ||
|
|
||
| def _syncPointsPrimitive(self): | ||
| """Synchronize scene object's symbol and size""" | ||
| if self.__primitive is not None: | ||
| symbol, size = self._getSceneSymbol() | ||
| self.__primitive.marker = symbol | ||
| self.__primitive.setAttribute("size", size, copy=False) | ||
| self.__primitive.setAttribute("size", self.__scaleFactor * size, copy=False) | ||
|
|
||
| def _getPickingDistances(self) -> float | numpy.ndarray: | ||
| """Returns distances below which to consider a point as picked | ||
|
|
@@ -208,7 +213,7 @@ def _getPickingDistances(self) -> float | numpy.ndarray: | |
| _, size = self._getSceneSymbol() | ||
| return numpy.maximum(size, 3.0) | ||
|
|
||
| def _getSceneSymbol(self) -> tuple[str, float | ArrayLike]: | ||
| def _getSceneSymbol(self) -> tuple[str, float | numpy.ndarray]: | ||
|
t20100 marked this conversation as resolved.
|
||
| """Returns a symbol name and size suitable for scene primitives. | ||
|
|
||
| :return: (symbol, size) | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.