Adjusting the demos

This commit is contained in:
esimov
2020-06-13 08:58:34 +03:00
parent 1e2277a95d
commit 51a427c843
8 changed files with 18 additions and 17 deletions

View File

@@ -10,8 +10,11 @@ html, body {
transform: translate(-50%, -50%);
}
#canvas {
z-index: 99;
#wrapper {
position: absolute;
width: 640px; height: 480px;
left: 50%; top: 50%;
transform: translate(-50%, -50%);
}
#snapshot {

View File

@@ -162,7 +162,7 @@ func (d *Detector) clusterDetection(pixels []uint8, width, height int) []pigo.De
}
cParams := pigo.CascadeParams{
MinSize: 200,
MaxSize: 720,
MaxSize: 640,
ShiftFactor: 0.1,
ScaleFactor: 1.1,
ImageParams: *imgParams,

View File

Before

Width:  |  Height:  |  Size: 80 KiB

After

Width:  |  Height:  |  Size: 80 KiB

View File

Before

Width:  |  Height:  |  Size: 85 KiB

After

Width:  |  Height:  |  Size: 85 KiB

View File

Before

Width:  |  Height:  |  Size: 47 KiB

After

Width:  |  Height:  |  Size: 47 KiB

View File

Before

Width:  |  Height:  |  Size: 62 KiB

After

Width:  |  Height:  |  Size: 62 KiB

View File

@@ -52,12 +52,12 @@ var (
eyemasks = make([]js.Value, 6)
mouthmasks = make([]js.Value, 2)
sunglasses = []string{
"/images/neon-green.png",
"/images/neon-yellow.png",
"/images/sunglasses.png",
"/images/sunglass-yellow.png",
"/images/sunglass-red.png",
"/images/sunglass-green.png",
"/images/sunglass-disco.png",
"/images/carnival.png",
"/images/carnival2.png",
"/images/neon-disco.png",
}
masks = []string{
"/images/surgical-mask.png",
@@ -344,46 +344,44 @@ func (c *Canvas) detectKeyPress() {
switch {
case keyCode.String() == "q":
c.showFace = !c.showFace
case keyCode.String() == "e":
case keyCode.String() == "z":
c.showPupil = !c.showPupil
case keyCode.String() == "a":
c.drawCircle = !c.drawCircle
case keyCode.String() == "r":
case keyCode.String() == "w":
c.showEyeMask = !c.showEyeMask
case keyCode.String() == "x":
c.showCoord = !c.showCoord
case keyCode.String() == "f":
case keyCode.String() == "s":
c.showMouthMask = !c.showMouthMask
case keyCode.String() == "w":
case keyCode.String() == "e":
eyeMaskIdx++
if eyeMaskIdx > len(eyemasks)-1 {
eyeMaskIdx = 0
}
eyeMaskWidth = js.ValueOf(eyemasks[eyeMaskIdx].Get("naturalWidth")).Int()
eyeMaskHeight = js.ValueOf(eyemasks[eyeMaskIdx].Get("naturalHeight")).Int()
case keyCode.String() == "s":
case keyCode.String() == "d":
eyeMaskIdx--
if eyeMaskIdx < 0 {
eyeMaskIdx = len(eyemasks) - 1
}
eyeMaskWidth = js.ValueOf(eyemasks[eyeMaskIdx].Get("naturalWidth")).Int()
eyeMaskHeight = js.ValueOf(eyemasks[eyeMaskIdx].Get("naturalHeight")).Int()
case keyCode.String() == "z":
case keyCode.String() == "r":
mouthMaskIdx++
if mouthMaskIdx > len(mouthmasks)-1 {
mouthMaskIdx = 0
}
mouthMaskWidth = js.ValueOf(mouthmasks[mouthMaskIdx].Get("naturalWidth")).Int()
mouthMaskHeight = js.ValueOf(mouthmasks[mouthMaskIdx].Get("naturalHeight")).Int()
case keyCode.String() == "x":
case keyCode.String() == "f":
mouthMaskIdx--
if mouthMaskIdx < 0 {
mouthMaskIdx = len(mouthmasks) - 1
}
mouthMaskWidth = js.ValueOf(mouthmasks[mouthMaskIdx].Get("naturalWidth")).Int()
mouthMaskHeight = js.ValueOf(mouthmasks[mouthMaskIdx].Get("naturalHeight")).Int()
default:
c.drawCircle = false
}
return nil
})

View File

@@ -357,7 +357,7 @@ func (c *Canvas) drawDetection(data []uint8, dets [][]int) {
imgScale = float64(scale) / float64(maskWidth)
}
}
width, height := float64(maskWidth)*imgScale*0.75, float64(maskHeight)*imgScale*0.75
width, height := float64(maskWidth)*imgScale*0.7, float64(maskHeight)*imgScale*0.7
tx := row - int(width/2)
ty := p1[1] + (p1[1]-p2[1])/2 - int(height*0.5)