-
Notifications
You must be signed in to change notification settings - Fork 14
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
Adding Zoom 5 (or Zoom N) #312
Draft
vshekar
wants to merge
9
commits into
NSLS2:master
Choose a base branch
from
vshekar:zoom5
base: master
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.
Draft
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
6784c90
Adding Zoom level 5
vshekar 32aef69
Removed Zoom radio buttons:
vshekar 6935b2b
Zoom levels can be based on config
vshekar 9c6b6d7
Fixes to make Zoom 5 work:
vshekar ac7e670
Refactor drawRaster and fillPolyRaster
vshekar 6366d71
Added mousewheel to zoom and Ctrl + click for C2C
vshekar dacaf59
Ctrl+click checks if governor state is in SA
vshekar 5d68170
Raster snake data fix
vshekar 5daaba0
Update omega when drawing rasters
vshekar 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
There are no files selected for viewing
This file contains 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
This file contains 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
This file contains 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 |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| from qtpy.QtGui import QCursor | ||
| from qtpy.QtWidgets import QGraphicsView | ||
| from qtpy.QtCore import Signal, Qt | ||
| import daq_utils | ||
| import typing | ||
|
|
||
| if typing.TYPE_CHECKING: | ||
| from gui.control_main import ControlMain | ||
|
|
||
|
|
||
| class CustomView(QGraphicsView): | ||
| y_value = Signal(float) | ||
|
|
||
| def __init__(self, *args, **kwargs): | ||
| super().__init__(*args, **kwargs) | ||
| self.parent: ControlMain = kwargs['parent'] | ||
| self.control_pressed = False | ||
|
|
||
| def wheelEvent(self, event) -> None: | ||
| """Wheel event to manage zoom in/out of sample cam""" | ||
| self.y_value.emit(event.angleDelta().y()) | ||
| return super().wheelEvent(event) | ||
|
|
||
| def enterEvent(self, event): | ||
| self.setFocus() # set focus on mouse enter | ||
| super().enterEvent(event) | ||
|
|
||
| def keyPressEvent(self, event): | ||
| if event.key() == Qt.Key_Control: | ||
| self.control_pressed = True | ||
| self.setCursor(QCursor(Qt.CrossCursor)) | ||
|
|
||
|
|
||
| def keyReleaseEvent(self, event): | ||
| if event.key() == Qt.Key_Control: | ||
| self.control_pressed = False | ||
| self.setCursor(QCursor(Qt.ArrowCursor)) | ||
|
|
||
| def mousePressEvent(self, event) -> None: | ||
| if self.control_pressed and event.button() == Qt.LeftButton: | ||
| self.center_on_click(event) | ||
| return super().mousePressEvent(event) | ||
|
|
||
|
|
||
| def center_on_click(self, event): | ||
| # If C2C is not clicked and user is in control, then C2C | ||
| if self.parent.vidActionC2CRadio.isChecked(): | ||
| return | ||
| correctedC2C_x = daq_utils.screenPixCenterX + ( | ||
| event.pos().x() - (self.parent.centerMarker.x() + self.parent.centerMarkerCharOffsetX) | ||
| ) | ||
| correctedC2C_y = daq_utils.screenPixCenterY + ( | ||
| event.pos().y() - (self.parent.centerMarker.y() + self.parent.centerMarkerCharOffsetY) | ||
| ) | ||
| fov = self.parent.getCurrentFOV() | ||
| current_viewangle = self.parent.zoomSlider.get_current_viewangle() | ||
| comm_s = f'center_on_click({correctedC2C_x},{correctedC2C_y},{fov["x"]},{fov["y"]},source="screen",maglevel=0,viewangle={current_viewangle})' | ||
| if self.parent.govStateMessagePV.get(as_string=True) == "state SA": | ||
| self.parent.aux_send_to_server(comm_s) | ||
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.
Created CustomView mainly to handle events that happen when the sample cam is in focus. It handles the following events:
handle_wheelmethod ingui.camera.zoom_widget.ZoomSlider