Merge pull request #166 from camicroscope/release

Segmentation App Fix

Author: birm

apps/segment/segment.html

@@ -71,6 +71,8 @@
   <script type='text/javascript' src='../../common/sortable/Sortable.js'></script>
   <!-- AJV json validator engine -->
   <script type='text/javascript' src='../../common/ajv.js'></script>
+  <!-- IDB helper -->
+  <script type='text/javascript' src='../../common/idb.js'></script>
   <!--  common js END -->
 
   <!--  components js START -->

apps/segment/segment.js

@@ -106,6 +106,8 @@ function initCore() {
     // image loaded
     if (e.hasError) {
       $UI.message.addError(e.message)
+    }else{
+      $D.params.data = e;
     }
   });
 
@@ -363,7 +365,8 @@ function segmentROI(box) {
   self.showProgress();
 
   let fullResCvs = self.__fullsrc;
-  self.__img.src = $CAMIC.slideId+'\/'+self.__spImgX+','+self.__spImgY+','+self.__spImgWidth+','+self.__spImgHeight+'\/'+self.__spImgWidth+',/0/default.jpg';
+  const prefix_url = ImgloaderMode == 'iip'?`${window.location.origin}/img/IIP/raw/?IIIF=${$D.params.data.location}`:$CAMIC.slideId;
+  self.__img.src = prefix_url+'\/'+self.__spImgX+','+self.__spImgY+','+self.__spImgWidth+','+self.__spImgHeight+'\/'+self.__spImgWidth+',/0/default.jpg';
   self.__img.onload = function() {
     let image = cv.imread(self.__img);
     cv.imshow(fullResCvs, image);