개정판 64941327
issue #538: fix eq package
Change-Id: Ic3a29db6d6080a8302d66604e00e2b0febbbaee7
| DTI_PID/DTI_PID/MainWindow.py | ||
|---|---|---|
| 1805 | 1805 |
|
| 1806 | 1806 |
mask = np.ones((int(rect.height()), int(rect.width())), dtype=np.uint8) * 255 |
| 1807 | 1807 |
cv2.fillConvexPoly(mask, poly, (0)) |
| 1808 |
sym_img = cv2.bitwise_or(mask, symbol_image[round(rect.y()):round(rect.y() + rect.height()), round(rect.x()):round(rect.x() + rect.width())])
|
|
| 1808 |
sym_img = cv2.bitwise_or(mask, symbol_image[int(rect.y()):int(rect.y()) + int(rect.height()), int(rect.x()):int(rect.x()) + int(rect.width())])
|
|
| 1809 | 1809 |
sym_img = cv2.merge((sym_img, sym_img, sym_img)) |
| 1810 | 1810 |
|
| 1811 | 1811 |
h, w, c = sym_img.shape |
| 1812 | 1812 |
qImg = QImage(sym_img.data, w, h, w * c, QImage.Format_RGB888) |
| 1813 | 1813 |
#pixmap = QPixmap.fromImage(qImg) |
| 1814 | 1814 |
|
| 1815 |
self.onAreaSelected(None, None, None, None, package=qImg, position=rect.topLeft()) |
|
| 1816 |
|
|
| 1817 |
selected[0].transfer.onRemoved.emit(selected[0]) |
|
| 1815 |
self.onAreaSelected(None, None, None, None, package=qImg, position=rect.topLeft(), package_item=selected[0]) |
|
| 1818 | 1816 |
else: |
| 1819 | 1817 |
cmd = FenceCommand.FenceCommand(self.graphicsView) |
| 1820 | 1818 |
cmd.onSuccess.connect(self.onAreaSelected) |
| ... | ... | |
| 1827 | 1825 |
@date 2018.07.20 |
| 1828 | 1826 |
''' |
| 1829 | 1827 |
|
| 1830 |
def onAreaSelected(self, x, y, width, height, package=False, position=None): |
|
| 1828 |
def onAreaSelected(self, x, y, width, height, package=False, position=None, package_item=None):
|
|
| 1831 | 1829 |
try: |
| 1832 | 1830 |
image = self.graphicsView.image() |
| 1833 | 1831 |
if image is not None: |
| ... | ... | |
| 1845 | 1843 |
svg = QtImageViewer.createSymbolObject(newSym.getName()) |
| 1846 | 1844 |
offsetX, offsetY = [int(point) for point in newSym.getOriginalPoint().split(',')]
|
| 1847 | 1845 |
QtImageViewer.matchSymbolToLine(self.graphicsView.scene(), svg, QPoint(position.x() + offsetX, position.y() + offsetY)) |
| 1846 |
|
|
| 1847 |
package_item.transfer.onRemoved.emit(selected[0]) |
|
| 1848 | 1848 |
finally: |
| 1849 | 1849 |
self.onCommandRejected() |
| 1850 | 1850 |
QApplication.restoreOverrideCursor() |
내보내기 Unified diff
