Mirrors/blakeblackshear.frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2025-07-30 13:48:07 +02:00
Code Issues Projects Releases Wiki Activity

Only set colors for enabled objects (#4936)

Browse Source 
* Only create colormap for enabled labels

* Fix assigning
This commit is contained in:
Nicolas Mowen 2023-01-06 18:31:54 -07:00 committed by GitHub
parent d9c45a76fe
commit 543cad5497
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
frigate/config.py
View File

@ -962,6 +962,14 @@ class FrigateConfig(FrigateBaseModel):
camera_config.create_ffmpeg_cmds() camera_config.create_ffmpeg_cmds()
config.cameras[name] = camera_config config.cameras[name] = camera_config
# get list of unique enabled labels for tracking
enabled_labels = set(config.objects.track)
for _, camera in config.cameras.items():
enabled_labels.update(camera.objects.track)
config.model.create_colormap(enabled_labels)
for key, detector in config.detectors.items(): for key, detector in config.detectors.items():
detector_config: DetectorConfig = parse_obj_as(DetectorConfig, detector) detector_config: DetectorConfig = parse_obj_as(DetectorConfig, detector)
if detector_config.model is None: if detector_config.model is None:

10
frigate/detectors/detector_config.py
View File

@ -55,11 +55,13 @@ class ModelConfig(BaseModel):
**load_labels(config.get("labelmap_path", "/labelmap.txt")), **load_labels(config.get("labelmap_path", "/labelmap.txt")),
**config.get("labelmap", {}), **config.get("labelmap", {}),
} }
cmap = plt.cm.get_cmap("tab10", len(self._merged_labelmap.keys()))
self._colormap = {} self._colormap = {}
for key, val in self._merged_labelmap.items():
def create_colormap(self, enabled_labels: set[str]) -> None:
"""Get a list of colors for enabled labels."""
cmap = plt.cm.get_cmap("tab10", len(enabled_labels))
for key, val in enumerate(enabled_labels):
self._colormap[val] = tuple(int(round(255 * c)) for c in cmap(key)[:3]) self._colormap[val] = tuple(int(round(255 * c)) for c in cmap(key)[:3])
class Config: class Config: