Skip to content

Commit 75b4555

Browse files
committed
Updated PySide2 import for consistency
removed old todo removed debug print in generic.py
1 parent ebd1921 commit 75b4555

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

DeepLabStream.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,8 +284,8 @@ def get_pose_mp(input_q, output_q):
284284
start_time = time.time()
285285
if MODEL_ORIGIN == 'DLC':
286286
scmap, locref, pose = get_pose(frame, config, sess, inputs, outputs)
287-
# TODO: Remove alterations to original
288287
peaks = find_local_peaks_new(scmap, locref, ANIMALS_NUMBER, config)
288+
#Use the line below to use raw DLC output rather then DLStream optimization
289289
# peaks = pose
290290
if MODEL_ORIGIN == 'MADLC':
291291
peaks = get_ma_pose(frame, config, sess, inputs, outputs)

utils/generic.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,6 @@ def enable_stream(self, resolution, framerate, *args):
122122
(hopefully)
123123
"""
124124
# set video to first frame
125-
print('Thinking of beginning things...')
126125
self._camera = cv2.VideoCapture(VIDEO_SOURCE)
127126
self._camera.set(cv2.CAP_PROP_POS_FRAMES,0)
128127

utils/gui_image.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@
99
from utils.configloader import RESOLUTION
1010

1111
import cv2
12-
from PyQt5.QtCore import QObject, pyqtSignal, Qt, pyqtSlot
13-
from PyQt5.QtWidgets import QWidget, QLabel
14-
from PyQt5.QtGui import QImage, QPixmap
12+
from PySide2.QtCore import QObject
13+
from PySide2.QtCore import Signal as pyqtSignal
14+
from PySide2.QtCore import Slot as pyqtSlot
15+
from PySide2.QtWidgets import QWidget, QLabel
16+
from PySide2.QtGui import QImage, QPixmap
1517

1618
width, height = RESOLUTION
1719

0 commit comments

Comments
 (0)