From 333083509163023f69e5b3c62445ed6c5be806a8 Mon Sep 17 00:00:00 2001 From: jross Date: Tue, 17 Sep 2024 15:19:07 -0600 Subject: [PATCH 1/5] hot fixes. removed hardware dependencies from loading task --- pychron/experiment/experimentor.py | 3 +++ pychron/git/hosts/__init__.py | 3 +++ pychron/loading/loading_manager.py | 19 +++++++++++++------ pychron/loading/tasks/load_task.py | 1 - 4 files changed, 19 insertions(+), 7 deletions(-) diff --git a/pychron/experiment/experimentor.py b/pychron/experiment/experimentor.py index 3d72d6dab..e9a2e2e07 100644 --- a/pychron/experiment/experimentor.py +++ b/pychron/experiment/experimentor.py @@ -52,6 +52,9 @@ class Experimentor(DVCIrradiationable): activate_editor_event = Event save_event = Event + def activate(self): + pass + def prepare_destory(self): if self.executor: if self.executor.datahub: diff --git a/pychron/git/hosts/__init__.py b/pychron/git/hosts/__init__.py index 2fd371d11..2f2c76056 100644 --- a/pychron/git/hosts/__init__.py +++ b/pychron/git/hosts/__init__.py @@ -95,6 +95,9 @@ class BaseGitHostService(Loggable): default_remote_name = Str("origin") remote_url = Str + def set_authentication(self): + raise NotImplementedError + def make_url(self, *args, **kw): raise NotImplementedError diff --git a/pychron/loading/loading_manager.py b/pychron/loading/loading_manager.py index 8d813f44b..2a1a8f8e1 100644 --- a/pychron/loading/loading_manager.py +++ b/pychron/loading/loading_manager.py @@ -49,15 +49,13 @@ from pychron.core.helpers.traitsui_shortcuts import okcancel_view from pychron.core.pdf.pdf_graphics_context import PdfPlotGraphicsContext from pychron.core.ui.gui import invoke_in_main_thread +from pychron.core.ui.preference_binding import bind_preference from pychron.dvc.dvc_irradiationable import DVCIrradiationable from pychron.dvc.meta_object import MetaObjectException from pychron.envisage.view_util import open_view from pychron.hardware.jss57 import STP_MTRD -from pychron.lasers.stage_managers.stage_manager import StageManager -from pychron.lasers.stage_managers.video_stage_manager import VideoStageManager from pychron.loading.foot_pedal import FootPedal from pychron.loading.loading_pdf_writer import LoadingPDFWriter -from pychron.loading.tray_checker import TrayChecker from pychron.paths import paths # ============= enthought library imports ======================= @@ -242,8 +240,9 @@ class LoadingManager(DVCIrradiationable): _suppress_edit = Bool(False) - stage_manager = Instance(StageManager) - use_stage = Bool(True) + stage_manager = Instance('pychron.lasers.stage_managers.video_stage_manager.VideoStageManager') + + use_stage = Bool(False) foot_pedal = Instance(FootPedal, ()) interaction_mode_enabled = Bool(False) focus_motor = Instance(STP_MTRD) @@ -273,7 +272,7 @@ class LoadingManager(DVCIrradiationable): refresh_table = Event mode = "normal" - tray_checker = Instance(TrayChecker) + tray_checker = Instance('pychron.loading.tray_checker.TrayChecker') use_image_shift = True @@ -281,7 +280,15 @@ def __init__(self, *args, **kw): super(LoadingManager, self).__init__(*args, **kw) self.dvc.create_session() + pref_id = 'pychron.loading' + bind_preference( + self, "use_stage", "{}.use_stage".format(pref_id) + ) + if self.use_stage: + from pychron.lasers.stage_managers.video_stage_manager import VideoStageManager + from pychron.loading.tray_checker import TrayChecker + pxpermm = 55 self.stage_manager = VideoStageManager( parent=self, diff --git a/pychron/loading/tasks/load_task.py b/pychron/loading/tasks/load_task.py index d0b19c008..6723a5bb4 100644 --- a/pychron/loading/tasks/load_task.py +++ b/pychron/loading/tasks/load_task.py @@ -45,7 +45,6 @@ # ============= standard library imports ======================== # ============= local library imports ========================== -from pychron.loading.tray_checker import TrayChecker class LoadingTask(BaseManagerTask): From 62898b2b465ff94b4822270d8fdcaab7da0a23a9 Mon Sep 17 00:00:00 2001 From: jirhiker Date: Tue, 17 Sep 2024 21:19:48 +0000 Subject: [PATCH 2/5] Formatting changes --- pychron/loading/loading_manager.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pychron/loading/loading_manager.py b/pychron/loading/loading_manager.py index 2a1a8f8e1..1cf3a18cd 100644 --- a/pychron/loading/loading_manager.py +++ b/pychron/loading/loading_manager.py @@ -240,7 +240,9 @@ class LoadingManager(DVCIrradiationable): _suppress_edit = Bool(False) - stage_manager = Instance('pychron.lasers.stage_managers.video_stage_manager.VideoStageManager') + stage_manager = Instance( + "pychron.lasers.stage_managers.video_stage_manager.VideoStageManager" + ) use_stage = Bool(False) foot_pedal = Instance(FootPedal, ()) @@ -272,7 +274,7 @@ class LoadingManager(DVCIrradiationable): refresh_table = Event mode = "normal" - tray_checker = Instance('pychron.loading.tray_checker.TrayChecker') + tray_checker = Instance("pychron.loading.tray_checker.TrayChecker") use_image_shift = True @@ -280,13 +282,13 @@ def __init__(self, *args, **kw): super(LoadingManager, self).__init__(*args, **kw) self.dvc.create_session() - pref_id = 'pychron.loading' - bind_preference( - self, "use_stage", "{}.use_stage".format(pref_id) - ) + pref_id = "pychron.loading" + bind_preference(self, "use_stage", "{}.use_stage".format(pref_id)) if self.use_stage: - from pychron.lasers.stage_managers.video_stage_manager import VideoStageManager + from pychron.lasers.stage_managers.video_stage_manager import ( + VideoStageManager, + ) from pychron.loading.tray_checker import TrayChecker pxpermm = 55 From 9914561a8c289175dd1dfbb27093ebd214dbf9e0 Mon Sep 17 00:00:00 2001 From: jross Date: Tue, 17 Sep 2024 17:13:11 -0600 Subject: [PATCH 3/5] hot fixes. fixed command register --- pychron/pyscripts/aqua_pyscript.py | 2 +- pychron/pyscripts/laser_pyscript.py | 2 +- pychron/pyscripts/measurement/ngx_measurement_pyscript.py | 2 +- pychron/pyscripts/measurement/quadera_measurement_pyscript.py | 2 +- pychron/pyscripts/measurement/thermo_measurement_pyscript.py | 2 +- pychron/pyscripts/measurement_pyscript.py | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pychron/pyscripts/aqua_pyscript.py b/pychron/pyscripts/aqua_pyscript.py index e2583000b..6217264f2 100644 --- a/pychron/pyscripts/aqua_pyscript.py +++ b/pychron/pyscripts/aqua_pyscript.py @@ -32,7 +32,7 @@ class AquaPyScript(ExtractionPyScript): _runthread = None def get_command_register(self): - cs = super(self).get_command_register() + cs = super().get_command_register() return cs + list(command_register.commands.items()) @command_register diff --git a/pychron/pyscripts/laser_pyscript.py b/pychron/pyscripts/laser_pyscript.py index 43456a8fd..d4f27cf7a 100644 --- a/pychron/pyscripts/laser_pyscript.py +++ b/pychron/pyscripts/laser_pyscript.py @@ -30,7 +30,7 @@ class LaserPyScript(ExtractionPyScript): _task = None def get_command_register(self): - cs = super(self).get_command_register() + cs = super().get_command_register() return cs + list(command_register.commands.items()) @verbose_skip diff --git a/pychron/pyscripts/measurement/ngx_measurement_pyscript.py b/pychron/pyscripts/measurement/ngx_measurement_pyscript.py index 5737bcc45..71bb3d3f9 100644 --- a/pychron/pyscripts/measurement/ngx_measurement_pyscript.py +++ b/pychron/pyscripts/measurement/ngx_measurement_pyscript.py @@ -25,7 +25,7 @@ class NGXMeasurementPyScript(MeasurementPyScript): def get_command_register(self): - cs = super(self).get_command_register() + cs = super().get_command_register() return cs + list(command_register.commands.items()) diff --git a/pychron/pyscripts/measurement/quadera_measurement_pyscript.py b/pychron/pyscripts/measurement/quadera_measurement_pyscript.py index 2461fc949..e68babd04 100644 --- a/pychron/pyscripts/measurement/quadera_measurement_pyscript.py +++ b/pychron/pyscripts/measurement/quadera_measurement_pyscript.py @@ -21,7 +21,7 @@ class QuaderaMeasurementPyScript(MeasurementPyScript): def get_command_register(self): - cs = super(self).get_command_register() + cs = super().get_command_register() return cs + list(command_register.commands.items()) @command_register diff --git a/pychron/pyscripts/measurement/thermo_measurement_pyscript.py b/pychron/pyscripts/measurement/thermo_measurement_pyscript.py index 324a86062..531171007 100644 --- a/pychron/pyscripts/measurement/thermo_measurement_pyscript.py +++ b/pychron/pyscripts/measurement/thermo_measurement_pyscript.py @@ -28,7 +28,7 @@ class ThermoMeasurementPyScript(MeasurementPyScript): def get_command_register(self): - cs = super(self).get_command_register() + cs = super().get_command_register() return cs + list(command_register.commands.items()) @verbose_skip diff --git a/pychron/pyscripts/measurement_pyscript.py b/pychron/pyscripts/measurement_pyscript.py index 4261365d8..6bbd8ca7e 100644 --- a/pychron/pyscripts/measurement_pyscript.py +++ b/pychron/pyscripts/measurement_pyscript.py @@ -86,7 +86,7 @@ def reset(self, arun): self._reset() def get_command_register(self): - cs = super(self).get_command_register() + cs = super().get_command_register() return cs + list(command_register.commands.items()) def truncate(self, style=None): From 70d700a5a34249f6333f2e06fff9286bb96106e3 Mon Sep 17 00:00:00 2001 From: jross Date: Mon, 23 Sep 2024 09:03:03 -0600 Subject: [PATCH 4/5] added activate/prepare destroy to all managers --- pychron/managers/manager.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pychron/managers/manager.py b/pychron/managers/manager.py index 302c81167..3ea606cc9 100644 --- a/pychron/managers/manager.py +++ b/pychron/managers/manager.py @@ -116,6 +116,12 @@ class Manager(Viewable, ConfigLoadable): error_code = None + def activate(self): + pass + + def prepare_destroy(self): + pass + def finish_loading(self): """ """ pass From fd956a744b61528b357228abd13d60ef689f1004 Mon Sep 17 00:00:00 2001 From: jross Date: Mon, 23 Sep 2024 09:11:04 -0600 Subject: [PATCH 5/5] fixed base task activated --- pychron/envisage/tasks/base_task.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pychron/envisage/tasks/base_task.py b/pychron/envisage/tasks/base_task.py index 3d7514af1..0b0399b33 100644 --- a/pychron/envisage/tasks/base_task.py +++ b/pychron/envisage/tasks/base_task.py @@ -321,10 +321,14 @@ class BaseManagerTask(BaseTask): manager = Any def prepare_destroy(self): - self.manager.prepare_destroy() + if self.manager: + if hasattr(self.manager, "prepare_destroy"): + self.manager.prepare_destroy() def activated(self): - self.manager.activate() + if self.manager: + if hasattr(self.manager, "activate"): + self.manager.activate() def view_pdf(self, p): self.view_file(p, application="Preview")