diff --git a/face-search-core/src/main/java/com/visual/face/search/core/domain/QualityInfo.java b/face-search-core/src/main/java/com/visual/face/search/core/domain/QualityInfo.java index 5c8999b..1738f08 100644 --- a/face-search-core/src/main/java/com/visual/face/search/core/domain/QualityInfo.java +++ b/face-search-core/src/main/java/com/visual/face/search/core/domain/QualityInfo.java @@ -22,7 +22,7 @@ public class QualityInfo { public boolean isMask(){ - return true; + return null != this.maskPoints && this.maskPoints.isMask(); } @@ -45,6 +45,10 @@ public class QualityInfo { return score; } + public boolean isMask(){ + return this.score >= 0.5; + } + @Override public String toString() { return "Mask{" + "score=" + score + '}'; @@ -108,5 +112,18 @@ public class QualityInfo { super.addAll(Arrays.asList(point)); return this; } + + /** + * 判定是否存在遮挡 + * @return + */ + public boolean isMask(){ + for(MaskPoint point : this){ + if(point.isMask()){ + return true; + } + } + return false; + } } } diff --git a/face-search-core/src/test/java/com/visual/face/search/core/test/models/SeetaMaskFaceKeyPointTest.java b/face-search-core/src/test/java/com/visual/face/search/core/test/models/SeetaMaskFaceKeyPointTest.java index 9b9c605..37836af 100644 --- a/face-search-core/src/test/java/com/visual/face/search/core/test/models/SeetaMaskFaceKeyPointTest.java +++ b/face-search-core/src/test/java/com/visual/face/search/core/test/models/SeetaMaskFaceKeyPointTest.java @@ -41,10 +41,10 @@ public class SeetaMaskFaceKeyPointTest extends BaseTest { QualityInfo.MaskPoints maskPoints = keyPointInfer.inference(cropImageMat, null); System.out.println(maskPoints); for(QualityInfo.MaskPoint maskPoint : maskPoints){ - if(maskPoint.score >= 0.5){ - Imgproc.circle(cropFace, new Point(maskPoint.x, maskPoint.y), 3, new Scalar(0,0,255), -1); + if(maskPoint.isMask()){ + Imgproc.circle(cropFace, new Point(maskPoint.x, maskPoint.y), 3, new Scalar(0, 0, 255), -1); }else{ - Imgproc.circle(cropFace, new Point(maskPoint.x, maskPoint.y), 3, new Scalar(255, 0,0), -1); + Imgproc.circle(cropFace, new Point(maskPoint.x, maskPoint.y), 3, new Scalar(255, 0, 0), -1); } } HighGui.imshow(fileName, cropFace); diff --git a/face-search-test/src/main/resources/image/validate/index/董明珠/1b11132d2ba62f058065c4eb80516624.jpeg b/face-search-test/src/main/resources/image/validate/index/董明珠/1b11132d2ba62f058065c4eb80516624.jpeg deleted file mode 100644 index 3a5418b..0000000 Binary files a/face-search-test/src/main/resources/image/validate/index/董明珠/1b11132d2ba62f058065c4eb80516624.jpeg and /dev/null differ