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

Jump to bottom

add enumeration values for acquisition mode #4820

Merged
merged 4 commits into from
Sep 23, 2016
Merged

add enumeration values for acquisition mode #4820

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c5eeef5
add further acquisition modes to model object mapping
mtbc Sep 5, 2016
0382ad9
add further acquisition modes to database scripts
mtbc Sep 5, 2016
a782968
reorder enumeration values in mapping so new follow previous
mtbc Sep 8, 2016
99b95c4
reorder enumeration values in SQL scripts so new follow previous
mtbc Sep 8, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions components/model/resources/mappings/acquisition.ome.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -737,6 +737,9 @@
<entry name="LCM"/>
<entry name="Other"/>
<entry name="Unknown"/>
<entry name="BrightField"/>
<entry name="SweptFieldConfocal"/>
<entry name="SPIM"/>
</enum>
<!-- Detector Settings Entity -->
<enum id="ome.model.enums.Binning">
Expand Down
12 changes: 12 additions & 0 deletions sql/psql/OMERO5.3DEV__10/enums_update.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,18 @@ insert into acquisitionmode (id,permissions,value)
select ome_nextval('seq_acquisitionmode'),-35,'Unknown' from acquisitionmode where not exists(
select 1 from acquisitionmode where value = 'Unknown') limit 1;

insert into acquisitionmode (id,permissions,value)
select ome_nextval('seq_acquisitionmode'),-35,'BrightField' from acquisitionmode where not exists(
select 1 from acquisitionmode where value = 'BrightField') limit 1;

insert into acquisitionmode (id,permissions,value)
select ome_nextval('seq_acquisitionmode'),-35,'SweptFieldConfocal' from acquisitionmode where not exists(
select 1 from acquisitionmode where value = 'SweptFieldConfocal') limit 1;

insert into acquisitionmode (id,permissions,value)
select ome_nextval('seq_acquisitionmode'),-35,'SPIM' from acquisitionmode where not exists(
select 1 from acquisitionmode where value = 'SPIM') limit 1;

insert into arctype (id,permissions,value)
select ome_nextval('seq_arctype'),-35,'Hg' from arctype where not exists(
select 1 from arctype where value = 'Hg') limit 1;
Expand Down
6 changes: 6 additions & 0 deletions sql/psql/OMERO5.3DEV__10/psql-footer.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2149,6 +2149,12 @@ insert into acquisitionmode (id,permissions,value)
select ome_nextval('seq_acquisitionmode'),-52,'Other';
insert into acquisitionmode (id,permissions,value)
select ome_nextval('seq_acquisitionmode'),-52,'Unknown';
insert into acquisitionmode (id,permissions,value)
select ome_nextval('seq_acquisitionmode'),-52,'BrightField';
insert into acquisitionmode (id,permissions,value)
select ome_nextval('seq_acquisitionmode'),-52,'SweptFieldConfocal';
insert into acquisitionmode (id,permissions,value)
select ome_nextval('seq_acquisitionmode'),-52,'SPIM';
insert into arctype (id,permissions,value)
select ome_nextval('seq_arctype'),-52,'Hg';
insert into arctype (id,permissions,value)
Expand Down