Skip to content
Snippets Groups Projects
Commit 42ae772e authored by Christoph Schmidt's avatar Christoph Schmidt
Browse files

Works now with the CaptDevice. Updated to Version 0.1.2

parent 6ded61fe
No related branches found
No related tags found
No related merge requests found
[project]
name = "lasercontrol"
version = "0.1.1"
version = "0.1.2"
authors = [
{ name="Christoph Schmidt", email="cschmidt.fs@gmail.com" },
]
......
......@@ -7,12 +7,12 @@ rich
pyyaml
# add the git repo
git+https://gitlab.tugraz.at/flexsensor-public/captdevicecontrol.git@develop
#git+https://gitlab.tugraz.at/flexsensor-public/captdevicecontrol.git@develop
git+https://gitlab.tugraz.at/flexsensor-public/modules/fswidgets.git@develop
git+https://gitlab.tugraz.at/flexsensor-public/modules/confighandler.git@develop
git+https://gitlab.tugraz.at/flexsensor-public/modules/cmp.git@develop
# Local installs
#../confighandler
#../captdevicecontrol
../captdevicecontrol
#../modules/cmp
......@@ -82,7 +82,9 @@ class LaserControlController:
self.mp_laser_controller.mp_read_laser_settings(self.model.port)
if isinstance(device, captdev.Controller):
self.model.capturing_device = device
self.model.capturing_device_connected = True
self.model.capturing_device.model.device_information.signals.device_connected_changed.connect(
lambda x: type(self.model).capturing_device_connected.fset(self.model, x)
)
......@@ -135,7 +137,7 @@ class LaserControlController:
# self.capt_device.clear_data()
# Reset the flag
# self.capt_device.model.capturing_finished = False
self.model.capturing_device.reset_capture()
if start_wavelength is None:
start_wavelength = self.model.sweep_start_wavelength
if stop_wavelength is None:
......
......@@ -138,7 +138,7 @@ class MPLaserDevice(cmp.CProcess):
time_start = 0
# with stdout_redirector(f) as s:
print(self.logger)
#print(self.logger)
self._internal_logger.info(f"**** Go to selected wavelength. Started moving laser to {wavelength}. ****")
# laser_finished_flag.value = False
# laser_moving_flag.value = True
......
......@@ -288,7 +288,7 @@ class LaserControlModel(object):
@capturing_device_connected.setter
def capturing_device_connected(self, value):
self._capturing_device_connected = value
self.signals.capturing_device_connected_changed.emit(self._capturing_device_connected)
self.signals.capturing_device_connected_changed.emit(self.capturing_device_connected)
@property
def capturing_device(self) -> captdev.Controller:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment