Skip to content
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

MX Energy Scan GUI changes #223

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

MX Energy Scan GUI changes #223

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4bf481d
removed escan from protocol list
mskinner5278 May 2, 2022
7c4226b
adds transmission to escan interface
mskinner5278 May 2, 2022
7addc03
adds transmission input callback for energy scan page
mskinner5278 May 2, 2022
72a10a9
Add PV connections for escan transmission ledits so that it does not …
mskinner5278 May 4, 2022
8f19756
fixed inconsistency with capitalization on escan transmission callback
mskinner5278 May 4, 2022
b271d21
Queue Requests button from the Energy Scan tab works.
mskinner5278 May 5, 2022
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
9 changes: 9 additions & 0 deletions lsdcGui.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2490,6 +2490,15 @@ def createSampleTab(self):
tempPlotButton.clicked.connect(self.queueEnScanCB)
clearEnscanPlotButton = QtWidgets.QPushButton("Clear")
clearEnscanPlotButton.clicked.connect(self.clearEnScanPlotCB)
escanTransmissionLabel = QtWidgets.QLabel("Transmission")
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is the transmission in the escan interface the same as in the main collection area? what is different about it?

some more explanation would help me understand the logic.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The intention is that the setpoint is different for each tab, but the RBV has a duplicate label to allow it to be displayed on both tabs.

self.transmissionReadback_ledit = self.transmissionReadback.getEntry()
escanTransmissionSPLabel = QtWidgets.QLabel("SetPoint:")
self.escan_transmission_ledit = self.transmissionSetPoint.getEntry()
self.escan_transmission_ledit.returnPressed.connect(self.setEScanTransCB)
hBoxEScanButtons.addWidget(escanTransmissionLabel)
hBoxEScanButtons.addWidget(self.transmissionReadback_ledit)
hBoxEScanButtons.addWidget(escanTransmissionSPLabel)
hBoxEScanButtons.addWidget(self.escan_transmission_ledit)
hBoxEScanButtons.addWidget(clearEnscanPlotButton)
hBoxEScanButtons.addWidget(tempPlotButton)
escanStepsLabel = QtWidgets.QLabel("Steps")
Expand Down