개정판 9f8375e7
issue #538: symbol drag -> shift + drag, fix item prop table origin, fix redo key
Change-Id: Ic6e8a4b8f79c6c4a5ff08bccecd96c77214390bd
| DTI_PID/DTI_PID/QtImageViewerScene.py | ||
|---|---|---|
| 126 | 126 |
item.setVisible(True) |
| 127 | 127 |
elif event.key() == Qt.Key_Z and event.modifiers() & Qt.ControlModifier: |
| 128 | 128 |
self._undo_stack.undo() |
| 129 |
elif event.key() == Qt.Key_R and event.modifiers() & Qt.ControlModifier:
|
|
| 129 |
elif event.key() == Qt.Key_Y and event.modifiers() & Qt.ControlModifier:
|
|
| 130 | 130 |
self._undo_stack.redo() |
| 131 | 131 |
elif self.selectedItems() and event.key() == Qt.Key_R and not(event.modifiers() & Qt.ControlModifier): |
| 132 | 132 |
self._undo_stack.push(RotateCommand(self, self.selectedItems())) |
| DTI_PID/DTI_PID/Shapes/SymbolSvgItem.py | ||
|---|---|---|
| 529 | 529 |
self.size[0], self.size[1] = round(self.sceneBoundingRect().width()), \ |
| 530 | 530 |
round(self.sceneBoundingRect().height()) |
| 531 | 531 |
|
| 532 |
scene_origin = self.mapToScene(self.transformOriginPoint()) |
|
| 533 |
self.origin = [round(scene_origin.x(), 1), round(scene_origin.y(), 1)] |
|
| 534 |
|
|
| 532 | 535 |
self.scene().contents_changed.emit() |
| 533 | 536 |
|
| 534 | 537 |
return value |
| ... | ... | |
| 979 | 982 |
|
| 980 | 983 |
self.rotate(self._angle) |
| 981 | 984 |
|
| 982 |
super(SymbolSvgItem, self).mouseMoveEvent(event) |
|
| 985 |
modifiers = QApplication.keyboardModifiers() |
|
| 986 |
if modifiers == Qt.ShiftModifier: |
|
| 987 |
super(SymbolSvgItem, self).mouseMoveEvent(event) |
|
| 988 |
|
|
| 989 |
def dragEnterEvent(self, event: QDragEnterEvent) -> None: |
|
| 990 |
pass |
|
| 983 | 991 |
|
| 984 | 992 |
def removeSelfAttr(self, attributeName): |
| 985 | 993 |
target = None |
| ... | ... | |
| 1064 | 1072 |
delta = 10 if modifiers == Qt.ControlModifier else 1 |
| 1065 | 1073 |
|
| 1066 | 1074 |
self.loc[1] = self.loc[1] - delta |
| 1067 |
self.origin[1] = self.origin[1] - delta |
|
| 1075 |
#self.origin[1] = self.origin[1] - delta
|
|
| 1068 | 1076 |
self.moveBy(0, -delta) |
| 1069 | 1077 |
elif event.key() == Qt.Key_Down: |
| 1070 | 1078 |
modifiers = QApplication.keyboardModifiers() |
| 1071 | 1079 |
delta = 10 if modifiers == Qt.ControlModifier else 1 |
| 1072 | 1080 |
|
| 1073 | 1081 |
self.loc[1] = self.loc[1] + delta |
| 1074 |
self.origin[1] = self.origin[1] + delta |
|
| 1082 |
#self.origin[1] = self.origin[1] + delta
|
|
| 1075 | 1083 |
self.moveBy(0, delta) |
| 1076 | 1084 |
elif event.key() == Qt.Key_Left: |
| 1077 | 1085 |
modifiers = QApplication.keyboardModifiers() |
| 1078 | 1086 |
delta = 10 if modifiers == Qt.ControlModifier else 1 |
| 1079 | 1087 |
|
| 1080 | 1088 |
self.loc[0] = self.loc[0] - delta |
| 1081 |
self.origin[0] = self.origin[0] - delta |
|
| 1089 |
#self.origin[0] = self.origin[0] - delta
|
|
| 1082 | 1090 |
self.moveBy(-delta, 0) |
| 1083 | 1091 |
elif event.key() == Qt.Key_Right: |
| 1084 | 1092 |
modifiers = QApplication.keyboardModifiers() |
| 1085 | 1093 |
delta = 10 if modifiers == Qt.ControlModifier else 1 |
| 1086 | 1094 |
|
| 1087 | 1095 |
self.loc[0] = self.loc[0] + delta |
| 1088 |
self.origin[0] = self.origin[0] + delta |
|
| 1096 |
#self.origin[0] = self.origin[0] + delta
|
|
| 1089 | 1097 |
self.moveBy(delta, 0) |
| 1090 | 1098 |
elif event.key() == Qt.Key_I or event.key() == Qt.Key_X or event.key() == Qt.Key_J: |
| 1091 | 1099 |
from App import App |
내보내기 Unified diff
