Skip to content

Added subframe function for FLIR service #369

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

Open
sfr348 wants to merge 1 commit into
base: develop
Choose a base branch
from
+13 −2
Open

Added subframe function for FLIR service #369

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
15 changes: 13 additions & 2 deletions catkit2/services/flir_camera/flir_camera.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@ def make_property_helper(name, read_only=False):

self.make_command('start_acquisition', self.start_acquisition)
self.make_command('end_acquisition', self.end_acquisition)
self.make_command('set_subframe', self.set_subframe)

self.temperature_thread = threading.Thread(target=self.monitor_temperature)
self.temperature_thread.start()
Expand Down Expand Up @@ -232,7 +233,16 @@ def monitor_temperature(self):
self.temperature.submit_data(np.array([temperature]))

self.sleep(1)


def set_subframe(self, x_offset, y_offset, new_width, new_height):
if self.is_acquiring.get()[0] > 0:
self.should_be_acquiring.clear()

self.offset_x = x_offset
self.offset_y = y_offset
self.width = new_width
self.height = new_height

def start_acquisition(self):
self.should_be_acquiring.set()

Expand All @@ -251,7 +261,8 @@ def end_acquisition(self):
sensor_height = _create_property('SensorHeight', read_only=True)

pixel_format = _create_enum_property('PixelFormat', 'pixel_format_enum')
adc_bit_depth = _create_enum_property('AdcBitDepth', 'adc_bit_depth_enum')
adc_bit_depth = _create_enum_property('AdcBitDepth', 'adc_bit_depth_enum')


acquisition_frame_rate = _create_property('AcquisitionFrameRate', stopped_acquisition=False)
acquisition_frame_rate_enable = _create_property('AcquisitionFrameRateEnable')
Expand Down
Loading