개정판 b77bfa55
fix eq scale, flip
Change-Id: I84e381355e39252be64b6cac5aa0d00f52ca15fe
| DTI_PID/DTI_PID/Shapes/SymbolSvgItem.py | ||
|---|---|---|
| 586 | 586 |
|
| 587 | 587 |
scale = '1.0' |
| 588 | 588 |
if type(self) is QEngineeringEquipmentItem: |
| 589 |
scaleX = round(self.transform().m11() * 100)
|
|
| 590 |
scaleY = round(self.transform().m22() * 100)
|
|
| 589 |
scaleX = abs(round(self.transform().m11() * 100))
|
|
| 590 |
scaleY = abs(round(self.transform().m22() * 100))
|
|
| 591 | 591 |
scale = str(scaleX / 100.0) + ',' + str(scaleY / 100.0) |
| 592 | 592 |
else: |
| 593 | 593 |
_scale = str(round(self.scale(), 2)) |
| ... | ... | |
| 1337 | 1337 |
elif event.key() == Qt.Key_Left: |
| 1338 | 1338 |
if modifiers == Qt.AltModifier and type(self) is QEngineeringEquipmentItem: |
| 1339 | 1339 |
transform = QTransform().translate(self.symbolOrigin[0], self.symbolOrigin[1]) |
| 1340 |
transform.scale(self.transform().m11() - 0.1 if self.transform().m11() - 0.1 > 0.3 else 0.3, self.transform().m22()) |
|
| 1340 |
if self.flip == 1: |
|
| 1341 |
transform.scale(self.transform().m11() + 0.1 if self.transform().m11() + 0.1 < -0.3 else -0.3, self.transform().m22()) |
|
| 1342 |
else: |
|
| 1343 |
transform.scale(self.transform().m11() - 0.1 if self.transform().m11() - 0.1 > 0.3 else 0.3, self.transform().m22()) |
|
| 1341 | 1344 |
transform.translate(-self.symbolOrigin[0], -self.symbolOrigin[1]) |
| 1342 | 1345 |
self.setTransform(transform) |
| 1343 | 1346 |
else: |
| ... | ... | |
| 1349 | 1352 |
elif event.key() == Qt.Key_Right: |
| 1350 | 1353 |
if modifiers == Qt.AltModifier and type(self) is QEngineeringEquipmentItem: |
| 1351 | 1354 |
transform = QTransform().translate(self.symbolOrigin[0], self.symbolOrigin[1]) |
| 1352 |
transform.scale(self.transform().m11() + 0.1, self.transform().m22()) |
|
| 1355 |
if self.flip == 1: |
|
| 1356 |
transform.scale(self.transform().m11() - 0.1, self.transform().m22()) |
|
| 1357 |
else: |
|
| 1358 |
transform.scale(self.transform().m11() + 0.1, self.transform().m22()) |
|
| 1353 | 1359 |
transform.translate(-self.symbolOrigin[0], -self.symbolOrigin[1]) |
| 1354 | 1360 |
self.setTransform(transform) |
| 1355 | 1361 |
else: |
| ... | ... | |
| 1361 | 1367 |
elif event.key() == Qt.Key_Plus or event.key() == 61: |
| 1362 | 1368 |
if type(self) is QEngineeringEquipmentItem: |
| 1363 | 1369 |
transform = QTransform().translate(self.symbolOrigin[0], self.symbolOrigin[1]) |
| 1364 |
transform.scale(self.transform().m11() + 0.1, self.transform().m22() + 0.1) |
|
| 1370 |
if self.flip == 1: |
|
| 1371 |
transform.scale(self.transform().m11() - 0.1, self.transform().m22() + 0.1) |
|
| 1372 |
else: |
|
| 1373 |
transform.scale(self.transform().m11() + 0.1, self.transform().m22() + 0.1) |
|
| 1365 | 1374 |
transform.translate(-self.symbolOrigin[0], -self.symbolOrigin[1]) |
| 1366 | 1375 |
self.setTransform(transform) |
| 1367 | 1376 |
else: |
| ... | ... | |
| 1369 | 1378 |
elif event.key() == Qt.Key_Minus: |
| 1370 | 1379 |
if type(self) is QEngineeringEquipmentItem: |
| 1371 | 1380 |
transform = QTransform().translate(self.symbolOrigin[0], self.symbolOrigin[1]) |
| 1372 |
transform.scale(self.transform().m11() - 0.1 if self.transform().m11() - 0.1 > 0.3 else 0.3, self.transform().m22() - 0.1 if self.transform().m22() - 0.1 > 0.3 else 0.3) |
|
| 1381 |
if self.flip == 1: |
|
| 1382 |
transform.scale(self.transform().m11() + 0.1 if self.transform().m11() + 0.1 < -0.3 else -0.3, self.transform().m22() - 0.1 if self.transform().m22() - 0.1 > 0.3 else 0.3) |
|
| 1383 |
else: |
|
| 1384 |
transform.scale(self.transform().m11() - 0.1 if self.transform().m11() - 0.1 > 0.3 else 0.3, self.transform().m22() - 0.1 if self.transform().m22() - 0.1 > 0.3 else 0.3) |
|
| 1373 | 1385 |
transform.translate(-self.symbolOrigin[0], -self.symbolOrigin[1]) |
| 1374 | 1386 |
self.setTransform(transform) |
| 1375 | 1387 |
else: |
| ... | ... | |
| 1971 | 1983 |
|
| 1972 | 1984 |
scaleNode = Element('SCALE')
|
| 1973 | 1985 |
if type(self) is QEngineeringEquipmentItem: |
| 1974 |
scaleX = round(self.transform().m11() * 100)
|
|
| 1975 |
scaleY = round(self.transform().m22() * 100)
|
|
| 1986 |
scaleX = abs(round(self.transform().m11() * 100))
|
|
| 1987 |
scaleY = abs(round(self.transform().m22() * 100))
|
|
| 1976 | 1988 |
scaleNode.text = str(scaleX / 100.0) + ',' + str(scaleY / 100.0) |
| 1977 | 1989 |
else: |
| 1978 | 1990 |
_scale = str(round(self.scale(), 2)) |
내보내기 Unified diff
