Skip to content
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.

Sign up for GitHub

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

Warp e Adjust fixados #103

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Warp e Adjust fixados #103

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a59ceb0
Adicionando comentários e refatorando Warp com linhas
knowrafa Nov 20, 2018
acbb241
Resolvendo problemas no drawImage
knowrafa Nov 20, 2018
6516a94
Organizando warpCount
knowrafa Nov 21, 2018
8a57df1
Começado o refatoramento do Apolo.
mano0012 Nov 21, 2018
dcfd0a9
Voltando o apolo para antes de bugar.
mano0012 Nov 24, 2018
f3c3555
Consertando warp e adjust
knowrafa Dec 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
88 changes: 44 additions & 44 deletions afrodite.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ def __init__(self):
self.warpGoalMatrix = [[0,0],[WIDTH,0],[WIDTH,HEIGHT],[0,HEIGHT]]
self.tempOffset = [0,0]
self.graphicsViewVideoViewVideo.mousePressEvent = self.getPosWarp
self.editingWarp = False
self.quadrant = -1

self.checkBoxInvertImage.clicked.connect(self.toggleInvertImage)
Expand Down Expand Up @@ -231,36 +232,36 @@ def clickedPlay(self):
def keyPressEvent(self, QKeyEvent):
if QKeyEvent.key() == QtCore.Qt.Key_Space and self.pushButtonPlayStart.isEnabled():
self.clickedPlay()
if not self.pushButtonCaptureWarpWarp.isEnabled():
if QKeyEvent.key() == QtCore.Qt.Key_A:
if not self.pushButtonCaptureWarpWarp.isEnabled(): #Verifica se o botão de Warp está desativado (Indica que o Warp está sendo realizado)
if QKeyEvent.key() == QtCore.Qt.Key_A: # Se a tecla A for apertada
#print ("<")
self.warpMatriz[self.quadrant][0] -= 1
if QKeyEvent.key() == QtCore.Qt.Key_D:
if QKeyEvent.key() == QtCore.Qt.Key_D: # Se a tecla D for apertada
#print (">")
self.warpMatriz[self.quadrant][0] += 1
if QKeyEvent.key() == QtCore.Qt.Key_W:
if QKeyEvent.key() == QtCore.Qt.Key_W: # Se a tecla W for apertada
#print ("^")
self.warpMatriz[self.quadrant][1] -= 1
if QKeyEvent.key() == QtCore.Qt.Key_S:
if QKeyEvent.key() == QtCore.Qt.Key_S: # Se a tecla S for apertada
#print ("v")
self.warpMatriz[self.quadrant][1] += 1
if QKeyEvent.key() == QtCore.Qt.Key_Enter or QKeyEvent.key() == QtCore.Qt.Key_Return:
self.hades.eventWarp(self.warpMatriz)
self.exitWarp()
self.warpCount = 0
if QKeyEvent.key() == QtCore.Qt.Key_Enter or QKeyEvent.key() == QtCore.Qt.Key_Return: # Se alguma das teclas 'Enter' for pressionada
self.exitWarp() #
self.editingWarp = False
self.warpCount = 0 # Reseta o warp
for i in range(0, 4):
key = "line" + str(i+1)
if key in self.objectsToDraw.keys():
del self.objectsToDraw[key]

if self.warpCount == 10:
if self.editingWarp:
for i in range(0, 4):
self.objectsToDraw["line" + str(i+1)] = {
"shape": "line",
"points": (self.warpMatriz[i%4], self.warpMatriz[(i+1)%4]),
"position": (self.warpMatriz[i%4][0], self.warpMatriz[i%4][1]),
"target": (self.warpMatriz[(i+1)%4][0], self.warpMatriz[(i+1)%4][1]),
"color": (0, 255, 0),
"lineThickness": 1,
"label": "Warp" + str(i+1),
}
self.drawImageVideoView()

Expand Down Expand Up @@ -390,11 +391,11 @@ def drawImageVideoView(self):
(objectToDraw["position"][0] + objectToDraw["limit"],
objectToDraw["position"][1] + objectToDraw["limit"]),
objectToDraw["color"], 2)
elif objectToDraw["shape"] == "line":
cv2.line(self.image, (objectToDraw["points"][0][0], objectToDraw["points"][0][1]), (objectToDraw["points"][1][0], objectToDraw["points"][1][1]), objectToDraw["color"], objectToDraw["lineThickness"])
#elif objectToDraw["shape"] == "line":
# cv2.line(self.image, (objectToDraw["points"][0][0], objectToDraw["points"][0][1]), (objectToDraw["points"][1][0], objectToDraw["points"][1][1]), objectToDraw["color"], objectToDraw["lineThickness"])

elif objectToDraw["shape"] == "line":
cv2.line(self.image, objectToDraw["position"], objectToDraw["target"], objectToDraw["color"], 2)
cv2.line(self.image, objectToDraw["position"], objectToDraw["target"], objectToDraw["color"], 1)

# MENU BAR
# MenuBarArquivo
Expand Down Expand Up @@ -725,7 +726,7 @@ def getPushButtonCaptureWarpReset(self):
self.horizontalSliderCaptureWarpOffsetRight.setValue(0)

self.warpCount = 0
for i in range(0, 4):
for i in range(0, 4): # 'For' para deletar todas as linhas que eram desenhadas na imagem
key = "line" + str(i+1)
if key in self.objectsToDraw.keys():
del self.objectsToDraw[key]
Expand Down Expand Up @@ -764,37 +765,27 @@ def warpOffsetChanged(self):
def getPosWarp(self, event):
px = event.pos().x()
py = event.pos().y()

if not self.pushButtonCaptureWarpWarp.isEnabled():
if self.warpCount < 4:
self.callHadesWarpEvent(px,py)
if self.warpCount == 9:
if self.warpCount == 4 and not self.editingWarp:
self.warpMatriz = self.hades.ordenaWarp(self.warpMatriz)
for i in range(0, 4):
self.warpMatriz = self.hades.ordenaWarp(self.warpMatriz)
self.objectsToDraw["line" + str(i + 1)] = {
self.objectsToDraw["line" + str(i+1)] = {
"shape": "line",
"points": (self.warpMatriz[i % 4], self.warpMatriz[(i + 1) % 4]),
"position": (self.warpMatriz[i%4][0], self.warpMatriz[i%4][1]),
"target": (self.warpMatriz[(i+1)%4][0], self.warpMatriz[(i+1)%4][1]),
"color": (0, 255, 0),
"lineThickness": 1,
"label": "Warp" + str(i + 1),
}
self.drawImageVideoView()
self.drawImageVideoView()
self.horizontalSliderCaptureWarpOffsetLeft.setValue(0)
self.horizontalSliderCaptureWarpOffsetRight.setValue(0)
self.warpCount = 10

elif self.warpCount == 10:
if px < WIDTH/2 and py < HEIGHT/2: #QUADRANT 1
print(self.quadrant)
self.quadrant = 0
elif px > WIDTH/2 and py < HEIGHT/2: #QUADRANT 2
print(self.quadrant)
self.quadrant = 1
elif px > WIDTH/2 and py > HEIGHT/2: #QUADRANT 3
print(self.quadrant)
self.quadrant = 2
elif px < WIDTH/2 and py > HEIGHT/2: #QUADRANT 4
print(self.quadrant)
self.quadrant = 3
self.editingWarp = True

elif self.editingWarp:
self.quadrant = self.whichQuadrant(px, py)

elif not self.pushButtonCaptureWarpAdjust.isEnabled():
self.callHadesAdjustGoalEvent(px, py)
Expand All @@ -808,6 +799,18 @@ def setOffset(self, Offset):
self.horizontalSliderCaptureWarpOffsetLeft.setValue(Offset[0])
self.horizontalSliderCaptureWarpOffsetRight.setValue(Offset[1])

def whichQuadrant(self, px, py):
quadrant = None
if px < WIDTH/2 and py < HEIGHT/2: #QUADRANT 1
quadrant = 0
elif px > WIDTH/2 and py < HEIGHT/2: #QUADRANT 2
quadrant = 1
elif px > WIDTH/2 and py > HEIGHT/2: #QUADRANT 3
quadrant = 2
elif px < WIDTH/2 and py > HEIGHT/2: #QUADRANT 4
quadrant = 3
return quadrant

'''
def getPosAdjust(self, event):
if not self.pushButtonCaptureWarpAdjust.isEnabled():
Expand All @@ -821,16 +824,13 @@ def getPosAdjust(self, event):
def callHadesWarpEvent(self, px, py):
self.warpMatriz[self.warpCount][0] = px
self.warpMatriz[self.warpCount][1] = py

self.warpCount+=1

if self.warpCount == 4:
self.warpCount = 9
# self.hades.eventWarp(self.warpMatriz)

def callHadesAdjustGoalEvent(self, px, py):
self.warpGoalMatrix[self.warpCount%4][0] = px
self.warpGoalMatrix[self.warpCount%4][1] = py
adjustQuadrant = self.whichQuadrant(px, py)

self.warpGoalMatrix[adjustQuadrant][0] = px
self.warpGoalMatrix[adjustQuadrant][1] = py

self.warpCount+=1

Expand Down