1. 添加 获取 Nvr 与 UTC 之间的插曲接口

2. 修复 球机聚焦接口存在的错误
3. 修复 PTZ 跳转到指定位置 Action 参数标准海康接口下无效的问题,以及无法设置Z值
4. 移除 GetBallCameraByName
5. 添加 PointPair 配置文件结构
This commit is contained in:
2024-10-22 15:20:51 +08:00
parent bd6cff81ec
commit 002d24e2b0
7 changed files with 40 additions and 35 deletions

View File

@@ -163,13 +163,12 @@ func (h *HIKBallCamera) PTZ2FullView() (Point, error) {
if !h.PTZGet(&ptz.P, &ptz.T, &ptz.Z) {
return Point{}, fmt.Errorf("PTZ Get Error")
}
h.WarpingPtByHomography(h.BallCameraCfg.Matrix.InvMatrix, Point{
return h.WarpingPtByHomography(h.BallCameraCfg.Matrix.InvMatrix, Point{
X: h.mapping(h.BallCameraCfg.Matrix.PStart, h.BallCameraCfg.Matrix.PMax, float64(ptz.P), h.BallCameraCfg.Matrix.PPositiveDirection, ""),
Y: h.mapping(h.BallCameraCfg.Matrix.TStart, h.BallCameraCfg.Matrix.TMax, float64(ptz.T), h.BallCameraCfg.Matrix.TPositiveDirection, "")})
return Point{}, nil
Y: h.mapping(h.BallCameraCfg.Matrix.TStart, h.BallCameraCfg.Matrix.TMax, float64(ptz.T), h.BallCameraCfg.Matrix.TPositiveDirection, "")}), nil
}
func (hikBC *HIKBallCamera) invert3x3() bool {
func (hikBC *HIKBallCamera) Invert3x3() bool {
a := hikBC.BallCameraCfg.Matrix.Matrix[0]
b := hikBC.BallCameraCfg.Matrix.Matrix[1]