for 3.9.6

SBU-BMI · Aug 5, 2021 · 5411a2c · 5411a2c
1 parent 9d65b01
commit 5411a2c
Show file tree

Hide file tree

Showing 7 changed files with 117 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -71,3 +71,4 @@ results to QuIP.
 
 ## Support
 Feel free to add any support inquiry as a github issue to this repository. Other feedback can be given via [this form](https://docs.google.com/forms/d/e/1FAIpQLScL91LxrpAZjU88GBZP9gmcdgdf8__uNUwhws2lzU6Lr4qNwA/viewform).
+
diff --git a/caMicroscope.yml b/caMicroscope.yml
@@ -27,9 +27,9 @@ services:
       - mongo
   back:
     build:
-      context: "https://github.com/camicroscope/caracal.git#v3.9.4"
+      context: "https://github.com/camicroscope/caracal.git#v3.9.6"
       args:
-        viewer: "v3.9.4"
+        viewer: "v3.9.6"
     depends_on:
       - "mongo"
     ports:

diff --git a/config/mongo_idx.js b/config/mongo_idx.js
@@ -6,6 +6,7 @@ db.mark.createIndex({"provenance.image.slide":1,"provenance.analysis": 1})
 db.mark.createIndex({"provenance.image.slide": 1, "provenance.analysis.execution_id": 1})
 db.mark.createIndex({"provenance.image.slide": 1, "provenance.analysis.source": 1})
 db.mark.createIndex({"provenance.image.slide": 1})
+db.mark.createIndex({"provenance.analysis.labelId": 1})
 db.slide.createIndex({'study':1, 'specimen': 1, 'name': 1})
 db.template.createIndex({'id': 1})
 db.template.createIndex({'name': 1})

diff --git a/config/routes.json b/config/routes.json
@@ -165,6 +165,12 @@
     "handlers":[
       {"function":"findMarkTypes", "args": []}
     ]
+  },{
+    "route":"/data/Mark/updateMarksLabel",
+    "method":"post",
+    "handlers":[
+      {"function":"updateMarksLabel", "args": []}
+    ]
   },{
     "route":"/data/Presetlabels/add",
     "method":"post",

diff --git a/config/segments.json b/config/segments.json
diff --git a/quip-pathdb.yml b/quip-pathdb.yml
@@ -26,9 +26,9 @@ services:
       - ./images/:/data/images/
   back:
     build:
-      context: "https://github.com/camicroscope/caracal.git#v3.9.4"
+      context: "https://github.com/camicroscope/caracal.git#v3.9.6"
       args:
-        viewer: "v3.9.4"
+        viewer: "v3.9.6"
     depends_on:
       - "mongo"
     ports:
@@ -48,7 +48,7 @@ services:
     build:
       context: "https://github.com/SBU-BMI/PathDB.git#1.6.1"
       args:
-        viewer: "v3.9.4"
+        viewer: "v3.9.6"
     container_name: quip-pathdb
     restart: unless-stopped
     ports: ["443:443","80:80"]
@@ -67,7 +67,7 @@ services:
       - ./data:/data/
       - ./images:/data/images
   segloader:
-    build: "https://github.com/SBU-BMI/SegmentationLoader.git#2.0"
+    build: "https://github.com/SBU-BMI/SegmentationLoader.git#2.1"
     container_name: quip-segloader
     volumes:
       - ./data:/data

diff --git a/test/package-lock.json b/test/package-lock.json
Original file line number	Diff line number	Diff line change
Expand Up		@@ -71,3 +71,4 @@ results to QuIP.

		## Support
		Feel free to add any support inquiry as a github issue to this repository. Other feedback can be given via [this form](https://docs.google.com/forms/d/e/1FAIpQLScL91LxrpAZjU88GBZP9gmcdgdf8__uNUwhws2lzU6Lr4qNwA/viewform).