Fixes in calibration and camshift tests

pull/6025/head
Vladislav Sovrasov 9 years ago
parent 54c07ba0ff
commit 4e3a6328ba
  1. 2
      modules/python/test/test_calibration.py
  2. 4
      modules/python/test/test_camshift.py

@ -57,7 +57,7 @@ class calibration_test(NewOpenCVTests):
eps = 0.01 eps = 0.01
normCamEps = 10.0 normCamEps = 10.0
normDistEps = 0.01 normDistEps = 0.001
cameraMatrixTest = [[ 532.80992189, 0., 342.4952186 ], cameraMatrixTest = [[ 532.80992189, 0., 342.4952186 ],
[ 0., 532.93346422, 233.8879292 ], [ 0., 532.93346422, 233.8879292 ],

@ -49,7 +49,6 @@ class camshift_test(NewOpenCVTests):
def prepareRender(self): def prepareRender(self):
cv2.namedWindow('camshift')
self.render = TestSceneRender(self.get_sample('samples/data/pca_test1.jpg')) self.render = TestSceneRender(self.get_sample('samples/data/pca_test1.jpg'))
def runTracker(self): def runTracker(self):
@ -95,13 +94,10 @@ class camshift_test(NewOpenCVTests):
if self.show_backproj: if self.show_backproj:
vis[:] = prob[...,np.newaxis] vis[:] = prob[...,np.newaxis]
cv2.rectangle(vis, (self.track_window[0], self.track_window[1]), (self.track_window[0] + self.track_window[2], self.track_window[1] + self.track_window[3]), (0, 255, 0), 2)
trackingRect = np.array(self.track_window) trackingRect = np.array(self.track_window)
trackingRect[2] += trackingRect[0] trackingRect[2] += trackingRect[0]
trackingRect[3] += trackingRect[1] trackingRect[3] += trackingRect[1]
print(intersectionRate((self.render.getCurrentRect()), trackingRect))
self.assertGreater(intersectionRate((self.render.getCurrentRect()), trackingRect), 0.5) self.assertGreater(intersectionRate((self.render.getCurrentRect()), trackingRect), 0.5)
if framesCounter > 300: if framesCounter > 300:

Loading…
Cancel
Save