|
@@ -278,7 +278,16 @@ class SmartShooter(metaclass=SingletonType):
|
|
|
context.term()
|
|
context.term()
|
|
|
msg_send = "相机未连接或软件未打开"
|
|
msg_send = "相机未连接或软件未打开"
|
|
|
return False, msg_send
|
|
return False, msg_send
|
|
|
-
|
|
|
|
|
|
|
+ async def getConfigIso(self):
|
|
|
|
|
+ """获取ISO配置信息"""
|
|
|
|
|
+ camera_configs = settings.getSysConfigs(
|
|
|
|
|
+ "camera_configs",
|
|
|
|
|
+ "iso_config",
|
|
|
|
|
+ {"low": 100, "high": 6400, "mode": "un_auto"},
|
|
|
|
|
+ )
|
|
|
|
|
+ low_iso = camera_configs.get("low", 100)
|
|
|
|
|
+ high_iso = camera_configs.get("high", 6400)
|
|
|
|
|
+ return low_iso, high_iso
|
|
|
async def EnableCameraPreview(self, enable_status=True, msg_type=""):
|
|
async def EnableCameraPreview(self, enable_status=True, msg_type=""):
|
|
|
self.msg_type = msg_type
|
|
self.msg_type = msg_type
|
|
|
await self.SetCameraFPS(5)
|
|
await self.SetCameraFPS(5)
|
|
@@ -289,13 +298,7 @@ class SmartShooter(metaclass=SingletonType):
|
|
|
if not camera_states:
|
|
if not camera_states:
|
|
|
return False, "请先连接相机"
|
|
return False, "请先连接相机"
|
|
|
try:
|
|
try:
|
|
|
- camera_configs = settings.getSysConfigs(
|
|
|
|
|
- "camera_configs",
|
|
|
|
|
- "iso_config",
|
|
|
|
|
- {"low": 100, "high": 6400, "mode": "un_auto"},
|
|
|
|
|
- )
|
|
|
|
|
- low_iso = camera_configs.get("low", 100)
|
|
|
|
|
- high_iso = camera_configs.get("high", 6400)
|
|
|
|
|
|
|
+ low_iso,high_iso = self.getConfigIso()
|
|
|
print("LOW_ISO", low_iso)
|
|
print("LOW_ISO", low_iso)
|
|
|
print("HIGH_ISO", high_iso)
|
|
print("HIGH_ISO", high_iso)
|
|
|
# 等于auto就不设置
|
|
# 等于auto就不设置
|
|
@@ -409,6 +412,13 @@ class SmartShooter(metaclass=SingletonType):
|
|
|
if not camera_states:
|
|
if not camera_states:
|
|
|
return False, "请先连接相机"
|
|
return False, "请先连接相机"
|
|
|
try:
|
|
try:
|
|
|
|
|
+ low_iso,high_iso = self.getConfigIso()
|
|
|
|
|
+ print("LOW_ISO", low_iso)
|
|
|
|
|
+ print("HIGH_ISO", high_iso)
|
|
|
|
|
+ if str(low_iso).lower() != "auto":
|
|
|
|
|
+ await self.setCameraProperty(property="ISO", value=str(low_iso))
|
|
|
|
|
+ else:
|
|
|
|
|
+ print("low_iso 等于auto就不设置")
|
|
|
socket, context = self.__create_req()
|
|
socket, context = self.__create_req()
|
|
|
req = {}
|
|
req = {}
|
|
|
req["msg_type"] = "Request"
|
|
req["msg_type"] = "Request"
|