Skip to content

Commit 507178d

Browse files
chore: use camelCase ids for model in vision camera demo
1 parent b16cc36 commit 507178d

File tree

4 files changed

+52
-52
lines changed

4 files changed

+52
-52
lines changed

.eslintrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ module.exports = {
3232
customWordListFile: path.resolve(__dirname, '.cspell-wordlist.txt'),
3333
},
3434
],
35-
'camelcase': ['error', { properties: 'never' }],
35+
'camelcase': 'error',
3636
},
3737
plugins: ['prettier', 'markdown'],
3838
overrides: [

apps/computer-vision/app/vision_camera/index.tsx

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@ import SegmentationTask from '../../components/vision_camera/tasks/SegmentationT
3535
type TaskId = 'classification' | 'objectDetection' | 'segmentation';
3636
type ModelId =
3737
| 'classification'
38-
| 'objectDetection_ssdlite'
39-
| 'objectDetection_rfdetr'
40-
| 'segmentation_deeplab_resnet50'
41-
| 'segmentation_deeplab_resnet101'
42-
| 'segmentation_deeplab_mobilenet'
43-
| 'segmentation_lraspp'
44-
| 'segmentation_fcn_resnet50'
45-
| 'segmentation_fcn_resnet101'
46-
| 'segmentation_selfie';
38+
| 'objectDetectionSsdlite'
39+
| 'objectDetectionRfdetr'
40+
| 'segmentationDeeplabResnet50'
41+
| 'segmentationDeeplabResnet101'
42+
| 'segmentationDeeplabMobilenet'
43+
| 'segmentationLraspp'
44+
| 'segmentationFcnResnet50'
45+
| 'segmentationFcnResnet101'
46+
| 'segmentationSelfie';
4747

4848
type TaskVariant = { id: ModelId; label: string };
4949
type Task = { id: TaskId; label: string; variants: TaskVariant[] };
@@ -58,21 +58,21 @@ const TASKS: Task[] = [
5858
id: 'segmentation',
5959
label: 'Segment',
6060
variants: [
61-
{ id: 'segmentation_deeplab_resnet50', label: 'DeepLab ResNet50' },
62-
{ id: 'segmentation_deeplab_resnet101', label: 'DeepLab ResNet101' },
63-
{ id: 'segmentation_deeplab_mobilenet', label: 'DeepLab MobileNet' },
64-
{ id: 'segmentation_lraspp', label: 'LRASPP MobileNet' },
65-
{ id: 'segmentation_fcn_resnet50', label: 'FCN ResNet50' },
66-
{ id: 'segmentation_fcn_resnet101', label: 'FCN ResNet101' },
67-
{ id: 'segmentation_selfie', label: 'Selfie' },
61+
{ id: 'segmentationDeeplabResnet50', label: 'DeepLab ResNet50' },
62+
{ id: 'segmentationDeeplabResnet101', label: 'DeepLab ResNet101' },
63+
{ id: 'segmentationDeeplabMobilenet', label: 'DeepLab MobileNet' },
64+
{ id: 'segmentationLraspp', label: 'LRASPP MobileNet' },
65+
{ id: 'segmentationFcnResnet50', label: 'FCN ResNet50' },
66+
{ id: 'segmentationFcnResnet101', label: 'FCN ResNet101' },
67+
{ id: 'segmentationSelfie', label: 'Selfie' },
6868
],
6969
},
7070
{
7171
id: 'objectDetection',
7272
label: 'Detect',
7373
variants: [
74-
{ id: 'objectDetection_ssdlite', label: 'SSDLite MobileNet' },
75-
{ id: 'objectDetection_rfdetr', label: 'RF-DETR Nano' },
74+
{ id: 'objectDetectionSsdlite', label: 'SSDLite MobileNet' },
75+
{ id: 'objectDetectionRfdetr', label: 'RF-DETR Nano' },
7676
],
7777
},
7878
];
@@ -201,7 +201,7 @@ export default function VisionCameraScreen() {
201201
<ObjectDetectionTask
202202
{...taskProps}
203203
activeModel={
204-
activeModel as 'objectDetection_ssdlite' | 'objectDetection_rfdetr'
204+
activeModel as 'objectDetectionSsdlite' | 'objectDetectionRfdetr'
205205
}
206206
/>
207207
)}
@@ -210,13 +210,13 @@ export default function VisionCameraScreen() {
210210
{...taskProps}
211211
activeModel={
212212
activeModel as
213-
| 'segmentation_deeplab_resnet50'
214-
| 'segmentation_deeplab_resnet101'
215-
| 'segmentation_deeplab_mobilenet'
216-
| 'segmentation_lraspp'
217-
| 'segmentation_fcn_resnet50'
218-
| 'segmentation_fcn_resnet101'
219-
| 'segmentation_selfie'
213+
| 'segmentationDeeplabResnet50'
214+
| 'segmentationDeeplabResnet101'
215+
| 'segmentationDeeplabMobilenet'
216+
| 'segmentationLraspp'
217+
| 'segmentationFcnResnet50'
218+
| 'segmentationFcnResnet101'
219+
| 'segmentationSelfie'
220220
}
221221
/>
222222
)}

apps/computer-vision/components/vision_camera/tasks/ObjectDetectionTask.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {
1111
import { labelColor, labelColorBg } from '../utils/colors';
1212
import { TaskProps } from './types';
1313

14-
type ObjModelId = 'objectDetection_ssdlite' | 'objectDetection_rfdetr';
14+
type ObjModelId = 'objectDetectionSsdlite' | 'objectDetectionRfdetr';
1515

1616
type Props = TaskProps & { activeModel: ObjModelId };
1717

@@ -28,14 +28,14 @@ export default function ObjectDetectionTask({
2828
}: Props) {
2929
const ssdlite = useObjectDetection({
3030
model: SSDLITE_320_MOBILENET_V3_LARGE,
31-
preventLoad: activeModel !== 'objectDetection_ssdlite',
31+
preventLoad: activeModel !== 'objectDetectionSsdlite',
3232
});
3333
const rfdetr = useObjectDetection({
3434
model: RF_DETR_NANO,
35-
preventLoad: activeModel !== 'objectDetection_rfdetr',
35+
preventLoad: activeModel !== 'objectDetectionRfdetr',
3636
});
3737

38-
const active = activeModel === 'objectDetection_ssdlite' ? ssdlite : rfdetr;
38+
const active = activeModel === 'objectDetectionSsdlite' ? ssdlite : rfdetr;
3939

4040
const [detections, setDetections] = useState<Detection[]>([]);
4141
const [imageSize, setImageSize] = useState({ width: 1, height: 1 });

apps/computer-vision/components/vision_camera/tasks/SegmentationTask.tsx

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ import { CLASS_COLORS } from '../utils/colors';
2424
import { TaskProps } from './types';
2525

2626
type SegModelId =
27-
| 'segmentation_deeplab_resnet50'
28-
| 'segmentation_deeplab_resnet101'
29-
| 'segmentation_deeplab_mobilenet'
30-
| 'segmentation_lraspp'
31-
| 'segmentation_fcn_resnet50'
32-
| 'segmentation_fcn_resnet101'
33-
| 'segmentation_selfie';
27+
| 'segmentationDeeplabResnet50'
28+
| 'segmentationDeeplabResnet101'
29+
| 'segmentationDeeplabMobilenet'
30+
| 'segmentationLraspp'
31+
| 'segmentationFcnResnet50'
32+
| 'segmentationFcnResnet101'
33+
| 'segmentationSelfie';
3434

3535
type Props = TaskProps & { activeModel: SegModelId };
3636

@@ -47,41 +47,41 @@ export default function SegmentationTask({
4747
}: Props) {
4848
const segDeeplabResnet50 = useSemanticSegmentation({
4949
model: DEEPLAB_V3_RESNET50_QUANTIZED,
50-
preventLoad: activeModel !== 'segmentation_deeplab_resnet50',
50+
preventLoad: activeModel !== 'segmentationDeeplabResnet50',
5151
});
5252
const segDeeplabResnet101 = useSemanticSegmentation({
5353
model: DEEPLAB_V3_RESNET101_QUANTIZED,
54-
preventLoad: activeModel !== 'segmentation_deeplab_resnet101',
54+
preventLoad: activeModel !== 'segmentationDeeplabResnet101',
5555
});
5656
const segDeeplabMobilenet = useSemanticSegmentation({
5757
model: DEEPLAB_V3_MOBILENET_V3_LARGE_QUANTIZED,
58-
preventLoad: activeModel !== 'segmentation_deeplab_mobilenet',
58+
preventLoad: activeModel !== 'segmentationDeeplabMobilenet',
5959
});
6060
const segLraspp = useSemanticSegmentation({
6161
model: LRASPP_MOBILENET_V3_LARGE_QUANTIZED,
62-
preventLoad: activeModel !== 'segmentation_lraspp',
62+
preventLoad: activeModel !== 'segmentationLraspp',
6363
});
6464
const segFcnResnet50 = useSemanticSegmentation({
6565
model: FCN_RESNET50_QUANTIZED,
66-
preventLoad: activeModel !== 'segmentation_fcn_resnet50',
66+
preventLoad: activeModel !== 'segmentationFcnResnet50',
6767
});
6868
const segFcnResnet101 = useSemanticSegmentation({
6969
model: FCN_RESNET101_QUANTIZED,
70-
preventLoad: activeModel !== 'segmentation_fcn_resnet101',
70+
preventLoad: activeModel !== 'segmentationFcnResnet101',
7171
});
7272
const segSelfie = useSemanticSegmentation({
7373
model: SELFIE_SEGMENTATION,
74-
preventLoad: activeModel !== 'segmentation_selfie',
74+
preventLoad: activeModel !== 'segmentationSelfie',
7575
});
7676

7777
const active = {
78-
segmentation_deeplab_resnet50: segDeeplabResnet50,
79-
segmentation_deeplab_resnet101: segDeeplabResnet101,
80-
segmentation_deeplab_mobilenet: segDeeplabMobilenet,
81-
segmentation_lraspp: segLraspp,
82-
segmentation_fcn_resnet50: segFcnResnet50,
83-
segmentation_fcn_resnet101: segFcnResnet101,
84-
segmentation_selfie: segSelfie,
78+
segmentationDeeplabResnet50: segDeeplabResnet50,
79+
segmentationDeeplabResnet101: segDeeplabResnet101,
80+
segmentationDeeplabMobilenet: segDeeplabMobilenet,
81+
segmentationLraspp: segLraspp,
82+
segmentationFcnResnet50: segFcnResnet50,
83+
segmentationFcnResnet101: segFcnResnet101,
84+
segmentationSelfie: segSelfie,
8585
}[activeModel];
8686

8787
const [maskImage, setMaskImage] = useState<SkImage | null>(null);

0 commit comments

Comments
 (0)