KazukyAkayashi/m3_lightmeter
KazukyAkayashi/m3_lightmeter
1
0
Fork 0
mirror of https://github.com/vodemn/m3_lightmeter.git synced 2025-09-18 15:36:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

show pinhole shutter speed (wip)

Browse source
This commit is contained in:
Vadim 2025-09-04 09:45:46 +02:00
parent 424e4b4d29
commit f260d8d5ca
10 changed files with 82 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/l10n/intl_de.arb
View file

@ -62,6 +62,7 @@
"apertureValuesFilterDescription": "Wählen Sie den Blendenbereich für Ihr Objektiv",
"ndFilters": "ND Filter",
"ndFiltersFilterDescription": "Wählen Sie verfügbare ND-Filter",
"shutterSpeed": "Belichtungszeit",
"shutterSpeedValues": "Belichtungszeiten",
"shutterSpeedValue": "Belichtungszeit",
"shutterSpeedValuesFilterDescription": "Wählen Sie den Verschlusszeitenbereich für Ihre Kamera",

1
lib/l10n/intl_en.arb
View file

@ -62,6 +62,7 @@
"apertureValuesFilterDescription": "Select aperture range for your lens",
"ndFilters": "ND filters",
"ndFiltersFilterDescription": "Select available ND filters",
"shutterSpeed": "Shutter speed",
"shutterSpeedValues": "Shutter speed values",
"shutterSpeedValue": "Shutter speed value",
"shutterSpeedValuesFilterDescription": "Select shutter speed range for your camera",

1
lib/l10n/intl_fr.arb
View file

@ -62,6 +62,7 @@
"apertureValuesFilterDescription": "Sélectionnez la plage d'ouverture pour votre objectif",
"ndFilters": "Filtres ND",
"ndFiltersFilterDescription": "Sélectionnez les filtres ND disponibles",
"shutterSpeed": "Vitesse d'obturation",
"shutterSpeedValues": "Valeurs de la vitesse d'obturation",
"shutterSpeedValue": "Valeur de la vitesse d'obturation",
"shutterSpeedValuesFilterDescription": "Sélectionnez la plage de vitesses pour votre appareil",

1
lib/l10n/intl_pl.arb
View file

@ -62,6 +62,7 @@
"apertureValuesFilterDescription": "Wybierz zakres przysłony dla swojego obiektywu",
"ndFilters": "Filtry ND",
"ndFiltersFilterDescription": "Wybierz dostępne filtry ND",
"shutterSpeed": "Czas naświetlania",
"shutterSpeedValues": "Czasy naświetlania",
"shutterSpeedValue": "Czas naświetlania",
"shutterSpeedValuesFilterDescription": "Wybierz zakres czasów naświetlania dla swojej kamery",

1
lib/l10n/intl_ru.arb
View file

@ -62,6 +62,7 @@
"apertureValuesFilterDescription": "Выберите диапазон диафрагмы для вашего объектива",
"ndFilters": "ND фильтры",
"ndFiltersFilterDescription": "Выберите доступные ND фильтры",
"shutterSpeed": "Выдержка",
"shutterSpeedValues": "Значения выдержки",
"shutterSpeedValue": "Значение выдержки",
"shutterSpeedValuesFilterDescription": "Выберите диапазон выдержек для вашей камеры",

1
lib/l10n/intl_zh.arb
View file

@ -62,6 +62,7 @@
"apertureValuesFilterDescription": "选择镜头光圈范围",
"ndFilters": "ND 滤镜",
"ndFiltersFilterDescription": "选择可用的 ND 滤镜",
"shutterSpeed": "快门速度",
"shutterSpeedValues": "快门速度",
"shutterSpeedValue": "快门速度",
"shutterSpeedValuesFilterDescription": "选择相机快门范围",

6
lib/screens/metering/components/camera_container/widget_container_camera.dart
View file

@ -6,6 +6,7 @@ import 'package:lightmeter/data/models/exposure_pair.dart';
import 'package:lightmeter/data/models/feature.dart';
import 'package:lightmeter/data/models/metering_screen_layout_config.dart';
import 'package:lightmeter/platform_config.dart';
import 'package:lightmeter/providers/equipment_profile_provider.dart';
import 'package:lightmeter/providers/remote_config_provider.dart';
import 'package:lightmeter/res/dimens.dart';
import 'package:lightmeter/screens/metering/components/camera_container/bloc_container_camera.dart';
@ -125,7 +126,10 @@ class CameraContainer extends StatelessWidget {
enabledFeaturesHeight += Dimens.readingContainerSingleValueHeight;
enabledFeaturesHeight += Dimens.paddingS;
}
if (context.meteringFeature(MeteringScreenLayoutFeature.extremeExposurePairs)) {
if (EquipmentProfiles.selectedOf(context) is PinholeEquipmentProfile) {
enabledFeaturesHeight += Dimens.readingContainerSingleValueHeight;
enabledFeaturesHeight += Dimens.paddingS;
} else if (context.meteringFeature(MeteringScreenLayoutFeature.extremeExposurePairs)) {
enabledFeaturesHeight += Dimens.readingContainerDoubleValueHeight;
enabledFeaturesHeight += Dimens.paddingS;
}

32
lib/screens/metering/components/shared/readings_container/components/shutter_speed_container/widget_container_shutter_speed.dart Normal file
View file

@ -0,0 +1,32 @@
import 'package:flutter/material.dart';
import 'package:lightmeter/generated/l10n.dart';
import 'package:lightmeter/providers/films_provider.dart';
import 'package:lightmeter/screens/metering/components/shared/readings_container/components/shared/reading_value_container/widget_container_reading_value.dart';
import 'package:m3_lightmeter_resources/m3_lightmeter_resources.dart';
class ShutterSpeedContainer extends StatelessWidget {
final ShutterSpeedValue? shutterSpeedValue;
const ShutterSpeedContainer({
required this.shutterSpeedValue,
super.key,
});
@override
Widget build(BuildContext context) {
return ReadingValueContainer.singleValue(
value: ReadingValue(
label: S.of(context).shutterSpeed,
value: _shutterSpeed(context),
),
);
}
String _shutterSpeed(BuildContext context) {
if (shutterSpeedValue case final shutterSpeedValue?) {
return Films.selectedOf(context).reciprocityFailure(shutterSpeedValue).toString();
} else {
return '-';
}
}
}

6
lib/screens/metering/components/shared/readings_container/widget_container_readings.dart
View file

@ -11,6 +11,7 @@ import 'package:lightmeter/screens/metering/components/shared/readings_container
import 'package:lightmeter/screens/metering/components/shared/readings_container/components/iso_picker/widget_picker_iso.dart';
import 'package:lightmeter/screens/metering/components/shared/readings_container/components/lightmeter_pro_badge/widget_badge_lightmeter_pro.dart';
import 'package:lightmeter/screens/metering/components/shared/readings_container/components/nd_picker/widget_picker_nd.dart';
import 'package:lightmeter/screens/metering/components/shared/readings_container/components/shutter_speed_container/widget_container_shutter_speed.dart';
import 'package:lightmeter/utils/context_utils.dart';
import 'package:m3_lightmeter_resources/m3_lightmeter_resources.dart';
@ -45,7 +46,10 @@ class ReadingsContainer extends StatelessWidget {
const EquipmentProfilePicker(),
const _InnerPadding(),
],
if (context.meteringFeature(MeteringScreenLayoutFeature.extremeExposurePairs)) ...[
if (EquipmentProfiles.selectedOf(context) is PinholeEquipmentProfile) ...[
ShutterSpeedContainer(shutterSpeedValue: fastest?.shutterSpeed),
const _InnerPadding(),
] else if (context.meteringFeature(MeteringScreenLayoutFeature.extremeExposurePairs)) ...[
ExtremeExposurePairsContainer(
fastest: fastest,
slowest: slowest,

20
lib/screens/metering/screen_metering.dart
View file

@ -169,12 +169,22 @@ class MeteringContainerBuidler extends StatelessWidget {
static List<ExposurePair> buildExposureValues(
double ev,
StopType stopType,
EquipmentProfile equipmentProfile,
IEquipmentProfile equipmentProfile,
) {
if (ev.isNaN || ev.isInfinite) {
return List.empty();
}
if (equipmentProfile.id != "" && equipmentProfile is PinholeEquipmentProfile) {
final t = pow(equipmentProfile.aperture, 2) / pow(2, ev);
return [
ExposurePair(
ApertureValue(equipmentProfile.aperture, StopType.full),
ShutterSpeedValue(t, false, StopType.full),
),
];
}
/// Depending on the `stopType` the exposure pairs list length is multiplied by 1,2 or 3
final int evSteps = (ev * (stopType.index + 1)).round();
@ -236,10 +246,7 @@ class MeteringContainerBuidler extends StatelessWidget {
);
/// Full equipment profile, nothing to cut
if (equipmentProfile.id == "") {
return exposurePairs;
}
if (equipmentProfile.id != "" && equipmentProfile is EquipmentProfile) {
final equipmentApertureValues = equipmentProfile.apertureValues.whereStopType(stopType);
final equipmentShutterSpeedValues = equipmentProfile.shutterSpeedValues.whereStopType(stopType);
@ -262,6 +269,9 @@ class MeteringContainerBuidler extends StatelessWidget {
}
return exposurePairs.sublist(startCut, itemsCount - endCut);
}
return exposurePairs;
}
}
double calcShutterSpeed(double stopValue) {