Skip to content

Ticket2173: Added HRPD sample changer OPI #480

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

Merged
merged 10 commits into from
Apr 18, 2017
Merged

Ticket2173: Added HRPD sample changer OPI #480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a5303af
Added rotating sample changer OPI
DominicOram Apr 6, 2017
86dc78b
Fixed opi name
DominicOram Apr 6, 2017
cdd5e0f
Merge with master
Apr 6, 2017
9956a11
Add unclosed tag
Apr 7, 2017
a43338b
Added icon for sample changer, fixed so,e suggestions for the OPI
DominicOram Apr 10, 2017
5a97b9d
Merge branch 'Ticket2173_HRPD_sample_changer' of https://github.com/I…
DominicOram Apr 10, 2017
20f6db5
Simplified logic for when you can move device
DominicOram Apr 11, 2017
be60e7f
Top aligned error message
DominicOram Apr 11, 2017
e2abd31
Added better icon for rotating sample changer
DominicOram Apr 12, 2017
1a36d1d
Merge with master
Apr 18, 2017
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
4 changes: 3 additions & 1 deletion ...s.ibex.devicescreens/src/uk/ac/stfc/isis/ibex/devicescreens/components/ComponentType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,9 @@ public enum ComponentType {
/** Omron PLC. */
PLC,
/** Zoom sample stack. */
ZOOM_SAMPLE_STACK;
ZOOM_SAMPLE_STACK,
/** Sample changer for HRPD/POLARIS/GEM. */
ROT_SAMPLE_CHANGER;

private Target target;

Expand Down
10 changes: 9 additions & 1 deletion base/uk.ac.stfc.isis.ibex.opis/resources/opi_info.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -706,7 +706,15 @@
<macros>
</macros>
</value>
</entry>
</entry>
<entry>
<key>Rotating Sample Changer</key>
<value>
<type>ROT_SAMPLE_CHANGER</type>
<path>rot_sample_changer.opi</path>
<description>The OPI for the rotating sample changer on HRPD/GEM/POLARIS. No properties required.</description>
Copy link
Contributor

@AdrianPotter AdrianPotter Apr 7, 2017

Choose a reason for hiding this comment

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

Value tag is not closed

Copy link
Contributor

@AdrianPotter AdrianPotter Apr 7, 2017

Choose a reason for hiding this comment

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

It is now :)

</value>
</entry>
<entry>
<key>Omron PLC</key>
<value>
Expand Down
Loading