Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 9 additions & 1 deletion dlclivegui/gui/camera_config/trigger_config_dialog.py
Original file line number Diff line number Diff line change
Expand Up @@ -455,6 +455,14 @@ def _accept(self) -> None:
return

ns = _backend_namespace(self._cam)
ns["trigger"] = trigger.to_properties()
trigger_props = trigger.to_properties()

if not self._profile.show_strobe_fields:
trigger_props.pop("strobe_polarity", None)
trigger_props.pop("strobe_operation", None)
trigger_props.pop("strobe_duration", None)
trigger_props.pop("strobe_delay", None)

ns["trigger"] = trigger_props

self.accept()
6 changes: 6 additions & 0 deletions dlclivegui/gui/main_window.py
Original file line number Diff line number Diff line change
Expand Up @@ -1118,6 +1118,12 @@ def _save_config_to_path(self, path: Path) -> bool:
config.save(path)
self._settings_store.set_last_config_path(str(path))
self._settings_store.save_full_config_snapshot(config)

try:
self.settings.sync()
except Exception:
logger.debug("Failed to sync settings after saving config", exc_info=True)

except Exception as exc: # pragma: no cover - GUI interaction
self._show_error(str(exc))
return False
Expand Down
2 changes: 2 additions & 0 deletions tests/cameras/backends/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -1262,6 +1262,7 @@ def _make(
fps=0.0,
exposure=0,
gain=0.0,
preserve_mono=False,
enabled=True,
properties=None,
):
Expand Down Expand Up @@ -1293,6 +1294,7 @@ def _make(
fps=fps,
exposure=exposure,
gain=gain,
preserve_mono=preserve_mono,
enabled=enabled,
properties=props,
)
Expand Down
137 changes: 137 additions & 0 deletions tests/cameras/backends/test_gentl_backend.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,143 @@ def test_open_starts_stream_and_read_returns_frame(patch_gentl_sdk, gentl_settin
assert be._device_label is None


@pytest.mark.parametrize(
(
"pixel_format",
"preserve_mono",
"source_dtype",
"expected_shape",
"expected_output_format",
),
[
(
"Mono8",
True,
np.uint8,
(2, 3),
"Mono8",
),
(
"Mono8",
False,
np.uint8,
(2, 3, 3),
"BGR8",
),
(
"Mono12",
True,
np.uint16,
(2, 3),
"Mono8",
),
],
)
def test_mono_output_format_conversion_and_persistence(
patch_gentl_sdk,
gentl_settings_factory,
pixel_format,
preserve_mono,
source_dtype,
expected_shape,
expected_output_format,
):
gb = patch_gentl_sdk

settings = gentl_settings_factory(
preserve_mono=preserve_mono,
properties={
"gentl": {
"pixel_format": pixel_format,
}
},
)
backend = gb.GenTLCameraBackend(settings)

if source_dtype == np.uint8:
source = np.array(
[
[0, 32, 64],
[128, 192, 255],
],
dtype=np.uint8,
)
else:
source = np.array(
[
[0, 512, 1024],
[2048, 3072, 4095],
],
dtype=np.uint16,
)

component = types.SimpleNamespace(
data=source.ravel(),
height=source.shape[0],
width=source.shape[1],
)
buffer = types.SimpleNamespace(
payload=types.SimpleNamespace(
components=[component],
)
)

class FetchContext:
def __enter__(self):
return buffer

def __exit__(
self,
exc_type,
exc_value,
traceback,
):
return False

class FakeAcquirer:
remote_device = types.SimpleNamespace(
node_map=types.SimpleNamespace(),
)

def fetch(self, timeout):
return FetchContext()

backend._acquirer = FakeAcquirer()
backend._pixel_format = pixel_format
backend._camera_pixel_format = pixel_format

captured = backend.read()
frame = captured.frame

assert frame.dtype == np.uint8
assert frame.shape == expected_shape

# Native camera format and emitted application format are distinct.
assert backend.actual_pixel_format == pixel_format
assert backend.actual_output_format == expected_output_format

namespace = settings.properties["gentl"]
assert namespace["actual_output_format"] == expected_output_format
assert namespace["preserve_mono"] is preserve_mono

if preserve_mono:
assert frame.ndim == 2
else:
assert frame.ndim == 3
assert frame.shape[2] == 3

# Grayscale-to-BGR conversion duplicates the mono value
# across all three channels.
np.testing.assert_array_equal(
frame[:, :, 0],
frame[:, :, 1],
)
np.testing.assert_array_equal(
frame[:, :, 1],
frame[:, :, 2],
)


def test_fast_start_does_not_start_stream_and_read_times_out(patch_gentl_sdk, gentl_settings_factory):
gb = patch_gentl_sdk

Expand Down
Loading