Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: FocalLength bug #240

Merged
merged 1 commit into from
May 1, 2024
Merged

fix: FocalLength bug #240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion web/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "0.4.66",
"version": "0.4.67",
"type": "module",
"scripts": {
"dev": "vite",
Expand Down
2 changes: 1 addition & 1 deletion web/src/core/photo.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ class Photo {
* @example '24mm'
*/
public get focalLength(): string {
return localStorage.getItem('focalLength35mmMode') ? this.metadata.focalLengthIn35mm || '' : this.metadata.focalLength || '';
return localStorage.getItem('focalLength35mmMode') === 'false' ? this.metadata.focalLength || '' : this.metadata.focalLengthIn35mm || '';
}

/**
Expand Down
1 change: 1 addition & 0 deletions web/src/locales/translations/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"model": "Camera Model",
"lens": "Lens Model",
"focal": "Focal Length",
"focal-35mm": "Focal Length 35mm",
"aperture": "Aperture",
"shutter": "Shutter Speed",
"iso": "ISO",
Expand Down
1 change: 1 addition & 0 deletions web/src/locales/translations/ja.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"model": "カメラモデル",
"lens": "レンズモデル",
"focal": "焦点距離",
"focal-35mm": "35mm換算焦点距離",
"aperture": "絞り値",
"shutter": "シャッタースピード",
"iso": "ISO感度",
Expand Down
1 change: 1 addition & 0 deletions web/src/locales/translations/ko.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"model": "카메라 모델",
"lens": "렌즈 모델",
"focal": "화각",
"focal-35mm": "35mm 환산 화각",
"aperture": "조리개",
"shutter": "셔터 속도",
"iso": "ISO",
Expand Down
14 changes: 11 additions & 3 deletions web/src/pages/convert/components/override-metadata.popup.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ const OverrideMetadataPopup = () => {
const [make, setMake] = useState(overrideMetadataTarget?.metadata.make || '');
const [model, setModel] = useState(overrideMetadataTarget?.metadata.model || '');
const [lens, setLens] = useState(overrideMetadataTarget?.metadata.lensModel || '');
const [focal, setFocal] = useState(overrideMetadataTarget?.metadata.focalLength || '');
const [focalLength, setFocalLength] = useState(overrideMetadataTarget?.metadata.focalLength || '');
const [focalLengthIn35mm, setFocalLengthIn35mm] = useState(overrideMetadataTarget?.metadata.focalLengthIn35mm || '');
const [aperture, setAperture] = useState(overrideMetadataTarget?.metadata.fNumber || '');
const [iso, setIso] = useState(overrideMetadataTarget?.metadata.iso || '');
const [shutter, setShutter] = useState(overrideMetadataTarget?.metadata.exposureTime || '');
Expand All @@ -19,7 +20,8 @@ const OverrideMetadataPopup = () => {
if (overrideMetadataTarget) setMake(overrideMetadataTarget.metadata.make || '');
if (overrideMetadataTarget) setModel(overrideMetadataTarget.metadata.model || '');
if (overrideMetadataTarget) setLens(overrideMetadataTarget.metadata.lensModel || '');
if (overrideMetadataTarget) setFocal(overrideMetadataTarget.metadata.focalLength || '');
if (overrideMetadataTarget) setFocalLength(overrideMetadataTarget.metadata.focalLength || '');
if (overrideMetadataTarget) setFocalLengthIn35mm(overrideMetadataTarget.metadata.focalLengthIn35mm || '');
if (overrideMetadataTarget) setAperture(overrideMetadataTarget.metadata.fNumber || '');
if (overrideMetadataTarget) setIso(overrideMetadataTarget.metadata.iso || '');
if (overrideMetadataTarget) setShutter(overrideMetadataTarget.metadata.exposureTime || '');
Expand All @@ -40,7 +42,13 @@ const OverrideMetadataPopup = () => {
<ListInput label={t('make')} type="text" value={make} onChange={(e) => (setMake(e.target.value), (overrideMetadataTarget!.metadata.make = e.target.value))} />
<ListInput label={t('model')} type="text" value={model} onChange={(e) => (setModel(e.target.value), (overrideMetadataTarget!.metadata.model = e.target.value))} />
<ListInput label={t('lens')} type="text" value={lens} onChange={(e) => (setLens(e.target.value), (overrideMetadataTarget!.metadata.lensModel = e.target.value))} />
<ListInput label={t('focal')} type="text" value={focal} onChange={(e) => (setFocal(e.target.value), (overrideMetadataTarget!.metadata.focalLength = e.target.value))} />
<ListInput label={t('focal')} type="text" value={focalLength} onChange={(e) => (setFocalLength(e.target.value), (overrideMetadataTarget!.metadata.focalLength = e.target.value))} />
<ListInput
label={t('focal-35mm')}
type="text"
value={focalLengthIn35mm}
onChange={(e) => (setFocalLengthIn35mm(e.target.value), (overrideMetadataTarget!.metadata.focalLengthIn35mm = e.target.value))}
/>
<ListInput label={t('aperture')} type="text" value={aperture} onChange={(e) => (setAperture(e.target.value), (overrideMetadataTarget!.metadata.fNumber = e.target.value))} />
<ListInput label={t('iso')} type="text" value={iso} onChange={(e) => (setIso(e.target.value), (overrideMetadataTarget!.metadata.iso = e.target.value))} />
<ListInput label={t('shutter')} type="text" value={shutter} onChange={(e) => (setShutter(e.target.value), (overrideMetadataTarget!.metadata.exposureTime = e.target.value))} />
Expand Down