nqrduck/nqrduck-pulseprogrammer
1
0
Fork 0
mirror of https://github.com/nqrduck/nqrduck-pulseprogrammer.git synced 2024-11-09 11:20:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Changed event saving to list.

Browse source
This commit is contained in:
jupfi 2023-07-14 15:07:35 +02:00
parent 8440fd8172
commit d21539bcff
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/nqrduck_pulseprogrammer/model.py
View file

@ -16,14 +16,14 @@ class PulseProgrammerModel(ModuleModel):
self.pulse_sequence = PulseSequence("Untitled pulse sequence") self.pulse_sequence = PulseSequence("Untitled pulse sequence")
def add_event(self, event_name): def add_event(self, event_name):
self.pulse_sequence.events[event_name] = PulseSequence.Event(event_name, 0) self.pulse_sequence.events.append(PulseSequence.Event(event_name, 0))
logger.debug("Creating event %s with object id %s", event_name, id(self.pulse_sequence.events[event_name].parameters)) logger.debug("Creating event %s with object id %s", event_name, id(self.pulse_sequence.events[-1]))
# Create a default instance of the pulse parameter options and add it to the event # Create a default instance of the pulse parameter options and add it to the event
for name, pulse_parameter_class in self.pulse_parameter_options.items(): for name, pulse_parameter_class in self.pulse_parameter_options.items():
logger.debug("Adding pulse parameter %s to event %s", name, event_name) logger.debug("Adding pulse parameter %s to event %s", name, event_name)
self.pulse_sequence.events[event_name].parameters[name] = pulse_parameter_class(name) self.pulse_sequence.events[-1].parameters[name] = pulse_parameter_class(name)
logger.debug("Created pulse parameter %s with object id %s", name, id(self.pulse_sequence.events[event_name].parameters[name])) logger.debug("Created pulse parameter %s with object id %s", name, id(self.pulse_sequence.events[-1].parameters[name]))
logger.debug(self.pulse_sequence.dump_sequence_data()) logger.debug(self.pulse_sequence.dump_sequence_data())
self.events_changed.emit() self.events_changed.emit()

14
src/nqrduck_pulseprogrammer/view.py
View file

@ -85,15 +85,15 @@ class PulseProgrammerView(ModuleView):
for event in self.module.model.pulse_sequence.events: for event in self.module.model.pulse_sequence.events:
logger.debug("Adding event to pulseprogrammer view: %s", event) logger.debug("Adding event to pulseprogrammer view: %s", event)
# Create a label for the event # Create a label for the event
event_name = QLabel(event) event_name = QLabel(event.name)
event_name.setMinimumWidth(70) event_name.setMinimumWidth(70)
# Add an QLineEdit for the event # Add an QLineEdit for the event
line_edit = QLineEdit(str(self.module.model.pulse_sequence.events[event].duration)) line_edit = QLineEdit(str(event.duration))
line_edit.setMinimumWidth(30) line_edit.setMinimumWidth(30)
# Add a label for the unit # Add a label for the unit
unit_label = QLabel("µs") unit_label = QLabel("µs")
# Connect the editingFinished signal to the on_value_changed slot of the setting # Connect the editingFinished signal to the on_value_changed slot of the setting
line_edit.editingFinished.connect(lambda x=line_edit: self.module.model.pulse_sequence.events[event].on_duration_changed(x.text())) line_edit.editingFinished.connect(lambda x=line_edit: event.on_duration_changed(float(x.text()) * 1e-6))
# Add the label and the line edit to the layout # Add the label and the line edit to the layout
event_layout = QHBoxLayout() event_layout = QHBoxLayout()
event_layout.addWidget(event_name) event_layout.addWidget(event_name)
@ -104,7 +104,7 @@ class PulseProgrammerView(ModuleView):
self.layout().addLayout(event_layout) self.layout().addLayout(event_layout)
self.pulse_table.setColumnCount(len(self.module.model.pulse_sequence.events)) self.pulse_table.setColumnCount(len(self.module.model.pulse_sequence.events))
self.pulse_table.setHorizontalHeaderLabels(self.module.model.pulse_sequence.events) self.pulse_table.setHorizontalHeaderLabels([event.name for event in self.module.model.pulse_sequence.events])
self.set_parameter_icons() self.set_parameter_icons()
@ -112,9 +112,9 @@ class PulseProgrammerView(ModuleView):
for column_idx, event in enumerate(self.module.model.pulse_sequence.events): for column_idx, event in enumerate(self.module.model.pulse_sequence.events):
for row_idx, parameter in enumerate(self.module.model.pulse_parameter_options.keys()): for row_idx, parameter in enumerate(self.module.model.pulse_parameter_options.keys()):
logger.debug("Adding button for event %s and parameter %s", event, parameter) logger.debug("Adding button for event %s and parameter %s", event, parameter)
logger.debug("Parameter object id: %s", id(self.module.model.pulse_sequence.events[event].parameters[parameter])) logger.debug("Parameter object id: %s", id(event.parameters[parameter]))
button = QPushButton() button = QPushButton()
icon = QIcon(self.module.model.pulse_sequence.events[event].parameters[parameter].get_pixmap()) icon = QIcon(event.parameters[parameter].get_pixmap())
logger.debug("Icon size: %s", icon.availableSizes()) logger.debug("Icon size: %s", icon.availableSizes())
button.setIcon(icon) button.setIcon(icon)
button.setIconSize(icon.availableSizes()[0]) button.setIconSize(icon.availableSizes()[0])
@ -152,7 +152,7 @@ class OptionsDialog(QDialog):
self.label = QLabel("Change options for the pulse parameter: %s" % parameter) self.label = QLabel("Change options for the pulse parameter: %s" % parameter)
self.layout.addWidget(self.label) self.layout.addWidget(self.label)
parameter = parent.module.model.pulse_sequence.events[event].parameters[parameter] parameter = event.parameters[parameter]
options = parameter.get_options() options = parameter.get_options()