Merge pull request #4820 from mtbc/add-enums-minimal

add enumeration values for acquisition mode
ome · Sep 23, 2016 · 2d2ba8f · 2d2ba8f
2 parents 6888b58 + 99b95c4
commit 2d2ba8f
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 0 deletions.
diff --git a/components/model/resources/mappings/acquisition.ome.xml b/components/model/resources/mappings/acquisition.ome.xml
@@ -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">

diff --git a/sql/psql/OMERO5.3DEV__10/enums_update.sql b/sql/psql/OMERO5.3DEV__10/enums_update.sql
@@ -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;

diff --git a/sql/psql/OMERO5.3DEV__10/psql-footer.sql b/sql/psql/OMERO5.3DEV__10/psql-footer.sql
@@ -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)