Skip to content

adding saved state for plan parameters during a run #38

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
gnzng wants to merge 1 commit into
base: master
Choose a base branch
from
Open

adding saved state for plan parameters during a run #38

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
12 changes: 8 additions & 4 deletions xicam/Acquire/controlwidgets/runenginewidget.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ def __init__(self, *args, **kwargs):
self.planview.setSelectionModel(self.selectionmodel)

self.parameterview = ParameterTree()
self.saved_parameters = None

self.metadata = MetadataWidget()

Expand Down Expand Up @@ -96,9 +97,11 @@ def showPlan(self):

def copy(self):
self.metadata.reset()
planitem = self.plansmodel.itemFromIndex(
self.selectionmodel.currentIndex()
).data(Qt.UserRole)
# If we are in a running state, we should use the saved parameters from the class:
if self.saved_parameters is not None:
parameter_dict = self.saved_parameters
else:
planitem = self.plansmodel.itemFromIndex(self.selectionmodel.currentIndex()).data(Qt.UserRole)
parameter_dict = planitem.parameter.saveState(filter='user')["children"]
run_params_str = ""
keys_list = list(parameter_dict.keys()) # Convert to a list to allow indexing
Expand Down Expand Up @@ -136,7 +139,7 @@ def copy(self):
def run(self):
self.metadata.reset()
planitem = self.plansmodel.itemFromIndex(self.selectionmodel.currentIndex()).data(Qt.UserRole)

self.saved_parameters = planitem.parameter.saveState(filter='user')["children"] # Save the parameters to be accessed in the copy function
planitem.run(callback=partial(threads.invoke_in_main_thread, self.metadata.doc_consumer, force_event=True))

def abort(self):
Expand Down Expand Up @@ -166,6 +169,7 @@ def _started(self):
def _finished(self):
self.abortbutton.setEnabled(False)
self.pausebutton.setEnabled(False)
self.saved_parameters = None # Reset saved parameters after the plan is finished

def _aborted(self):
self._finished()
Expand Down