CI run 701 pushed to gh-pages

demo/stable/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dwv-jqmobile",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "description": "Medical viewer using DWV (DICOM Web Viewer) and jQuery Mobile.",
   "keywords": [
     "DICOM",
@@ -15,7 +15,7 @@
     "url": "git://github.com/ivmartel/dwv-jqmobile.git"
   },
   "dependencies": {
-    "dwv": "0.34.0",
+    "dwv": "0.34.1",
     "i18next": "~23.16.0",
     "i18next-browser-languagedetector": "~8.0.0",
     "i18next-http-backend": "~2.6.1",

demo/stable/resources/locales/de/translation.json

@@ -19,7 +19,7 @@
         "history": "Geschichte",
         "image": "Bild",
         "info": "Info",
-        "downloadState": "Zustand herunterladen",
+        "downloadAnnotations": "Herunterladen",
         "drawList": "Vermerke",
         "search": "Suche",
         "id": "ID",

demo/stable/resources/locales/en/translation.json

@@ -19,7 +19,7 @@
         "history": "History",
         "image": "Image",
         "info": "Info",
-        "downloadState": "Download state",
+        "downloadAnnotations": "Download",
         "drawList": "Annotations",
         "search": "Search",
         "id": "ID",

demo/stable/resources/locales/es/translation.json

@@ -19,7 +19,7 @@
         "history": "Historial",
         "image": "Imagen",
         "info": "Información",
-        "downloadState": "Estado de la descarga",
+        "downloadAnnotations": "Descargar",
         "drawList": "Anotaciones",
         "search": "Búsqueda",
         "id": "ID",

demo/stable/resources/locales/fr/translation.json

@@ -19,7 +19,7 @@
         "history": "Historique",
         "image": "Image",
         "info": "Info",
-        "downloadState": "Télécharger state",
+        "downloadAnnotations": "Télécharger",
         "drawList": "Annotations",
         "search": "Recherche",
         "id": "ID",

demo/stable/resources/locales/it/translation.json

@@ -19,7 +19,7 @@
         "history": "Storico",
         "image": "Immagine",
         "info": "Informazioni",
-        "downloadState": "Stato download",
+        "downloadAnnotations": "Scaricare",
         "drawList": "Annotazioni",
         "search": "Cerca",
         "id": "ID",

demo/stable/resources/locales/jp/translation.json

@@ -19,7 +19,7 @@
         "history": "ヒストリー",
         "image": "画像",
         "info": "情報",
-        "downloadState": "状態ファイルダウンロード",
+        "downloadAnnotations": "ダウンロード",
         "drawList": "アノテーション",
         "search": "検索",
         "id": "ID",

demo/stable/resources/locales/ro/translation.json

@@ -19,7 +19,7 @@
         "history": "Istorie",
         "image": "Imagine",
         "info": "Info",
-        "downloadState": "Statut descărcare",
+        "downloadAnnotations": "Descărcar",
         "drawList": "Adnotări",
         "search": "Căutare",
         "id": "ID",

demo/stable/resources/locales/ru/translation.json

@@ -19,7 +19,7 @@
         "history": "История",
         "image": "Изображение",
         "info": "Информация",
-        "downloadState": "Статус загрузки",
+        "downloadAnnotations": "Скачать",
         "drawList": "Аннотации",
         "search": "Поиск",
         "id": "ID",

demo/stable/resources/locales/zh/translation.json

@@ -19,7 +19,7 @@
         "history": "历史记录",
         "image": "图像",
         "info": "信息",
-        "downloadState": "下载状态",
+        "downloadAnnotations": "下载",
         "drawList": "注释",
         "search": "搜索",
         "id": "ID",

demo/stable/service-worker.js

@@ -1,7 +1,7 @@
 // https://developers.google.com/web/fundamentals/primers/service-workers/
 // chrome: chrome://inspect/#service-workers
 
-var CACHE_NAME = 'dwv-jqmobile-cache_v0.9.0';
+var CACHE_NAME = 'dwv-jqmobile-cache_v0.9.1';
 var urlsToCache = [
   './',
   './index.html',

demo/stable/src/appgui.js

@@ -110,17 +110,6 @@ dwvjq.gui.ToolboxContainer = function (app, infoController) {
       infoController.toggleListeners();
     };
 
-    var toggleSaveState = document.createElement('a');
-    toggleSaveState.setAttribute(
-      'class',
-      buttonClass + ' download-state ui-icon-action'
-    );
-    toggleSaveState.onclick = function () {
-      var blob = new Blob([app.getJsonState()], {type: 'application/json'});
-      toggleSaveState.href = window.URL.createObjectURL(blob);
-    };
-    toggleSaveState.download = 'state.json';
-
     var tags = document.createElement('a');
     tags.href = '#tags_page';
     tags.setAttribute('class', buttonClass + ' ui-icon-grid');
@@ -134,7 +123,6 @@ dwvjq.gui.ToolboxContainer = function (app, infoController) {
     node.appendChild(undo);
     node.appendChild(redo);
     node.appendChild(toggleInfo);
-    node.appendChild(toggleSaveState);
     node.appendChild(tags);
     node.appendChild(drawList);
     dwvjq.gui.refreshElement(node);

demo/stable/src/applauncher.js

@@ -15,7 +15,7 @@ function startApp() {
   dwvjq.i18n.translatePage();
 
   // show dwv version
-  dwvjq.gui.appendVersionHtml('0.9.0');
+  dwvjq.gui.appendVersionHtml('0.9.1');
 
   // application options
   var filterList = ['Threshold', 'Sharpen', 'Sobel'];
@@ -82,7 +82,8 @@ function startApp() {
   loadboxGui.setup(loaderList);
 
   // info layer
-  var infoController = new dwvjq.gui.info.Controller(myapp);
+  var infoDataId = '0';
+  var infoController = new dwvjq.gui.info.Controller(myapp, infoDataId);
   infoController.init();
 
   var infoElement = document.getElementById('infoLayer');
@@ -112,19 +113,17 @@ function startApp() {
   var nLoadItem = null;
   var nReceivedLoadError = null;
   var nReceivedLoadAbort = null;
-  var isFirstRender = null;
   myapp.addEventListener('loadstart', function (event) {
     // reset counts
     nLoadItem = 0;
     nReceivedLoadError = 0;
     nReceivedLoadAbort = 0;
-    isFirstRender = true;
     // hide drop box
     dropBoxLoader.showDropbox(false);
     // reset progress bar
     dwvjq.gui.displayProgress(0);
     // update info controller
-    if (event.loadtype === 'image') {
+    if (event.loadtype === 'image' && event.dataid === infoDataId) {
       infoController.reset();
     }
     // allow to cancel via crtl-x
@@ -141,30 +140,35 @@ function startApp() {
       infoController.onLoadItem(event);
     }
   });
-  myapp.addEventListener('renderstart', function (/*event*/) {
-    if (isFirstRender) {
-      infoController.addEventListener('valuechange', infoOverlay.onDataChange);
-    }
-  });
-  myapp.addEventListener('renderend', function (/*event*/) {
-    if (isFirstRender) {
-      isFirstRender = false;
-      // initialise and display the toolbox on first render
-      toolboxGui.initialise();
-      toolboxGui.display(true);
+
+  // init controller at first render start
+  var initInfoController = function () {
+    infoController.addEventListener('valuechange', infoOverlay.onDataChange);
+    myapp.removeEventListener('renderstart', initInfoController);
+  };
+  myapp.addEventListener('renderstart', initInfoController);
+  // init toolbox gui at first render end
+  var initToolboxGui = function () {
+    toolboxGui.initialise();
+    toolboxGui.display(true);
+    myapp.removeEventListener('renderend', initToolboxGui);
+  };
+  myapp.addEventListener('renderend', initToolboxGui);
+
+  myapp.addEventListener('load', function (event) {
+    // only initialise at first data
+    if (event.dataid === infoDataId) {
+      // initialise undo gui
+      undoGui.setup();
+      // update meta data table
+      metaDataGui.update(myapp.getMetaData('0'));
     }
   });
-  myapp.addEventListener('load', function (/*event*/) {
-    // initialise undo gui
-    undoGui.setup();
-    // update meta data table
-    metaDataGui.update(myapp.getMetaData(0));
-  });
-  myapp.addEventListener('loaderror', function (event) {
+  myapp.addEventListener('error', function (event) {
     console.error('load error', event);
     ++nReceivedLoadError;
   });
-  myapp.addEventListener('loadabort', function (/*event*/) {
+  myapp.addEventListener('abort', function (/*event*/) {
     ++nReceivedLoadAbort;
   });
   myapp.addEventListener('loadend', function (/*event*/) {

demo/stable/src/gui/generic.js

@@ -295,6 +295,25 @@ function capitalizeFirstLetter(str) {
   return str.charAt(0).toUpperCase() + str.slice(1);
 }
 
+function precisionRound(number, precision) {
+  var factor = Math.pow(10, precision);
+  var delta = 0.01 / factor; // fixes precisionRound(1.005, 2)
+  return Math.round(number * factor + delta) / factor;
+}
+
+function pointToString(point) {
+  var res = '(';
+  var values = point.getValues();
+  for (var i = 0; i < values.length; ++i) {
+    if (i !== 0) {
+      res += ',';
+    }
+    res += precisionRound(values[i], 2);
+  }
+  res += ')';
+  return res;
+}
+
 /**
  * Drawing list base gui.
  * @param {Object} app The associated application.
@@ -310,7 +329,7 @@ dwvjq.gui.DrawList = function (app) {
    * Initialise.
    */
   this.init = function () {
-    app.addEventListener('dataadd', update);
+    app.addEventListener('drawlayeradd', update);
     app.addEventListener('annotationadd', update);
     app.addEventListener('annotationupdate', update);
     app.addEventListener('annotationremove', update);
@@ -367,7 +386,7 @@ dwvjq.gui.DrawList = function (app) {
       var annotation = annotations[i];
       var simpleDetail = {
         id: annotation.id,
-        position: '',
+        position: pointToString(annotation.getCentroid()),
         type: capitalizeFirstLetter(annotation.getFactory().getName()),
         color: annotation.colour,
         description: annotation.textExpr
@@ -426,14 +445,12 @@ dwvjq.gui.DrawList = function (app) {
       };
     };
     // create a row onclick handler
-    var createRowOnClick = function (positionStr) {
+    var createRowOnClick = function (annot) {
       return function () {
         var layerGroup = app.getActiveLayerGroup();
         var viewController =
           layerGroup.getActiveViewLayer().getViewController();
-        var split = positionStr.substring(1, positionStr.length - 1).split(',');
-        var pos = new dwv.Point(split);
-        viewController.setCurrentIndex(pos);
+        viewController.setCurrentPosition(annot.getCentroid());
         // focus on the image
         dwvjq.gui.focusImage();
       };
@@ -492,9 +509,7 @@ dwvjq.gui.DrawList = function (app) {
           }
         } else {
           // id: link to image
-          cells[0].onclick = createRowOnClick(
-            cells[1].firstChild.data
-          );
+          cells[0].onclick = createRowOnClick(annot);
           cells[0].onmouseover = dwvjq.html.setCursorToPointer;
           cells[0].onmouseout = dwvjq.html.setCursorToDefault;
           // color: just display the input color with no callback
@@ -558,6 +573,36 @@ dwvjq.gui.DrawList = function (app) {
     // draw list table
     node.appendChild(table);
 
+    // save draw button
+    var saveButton = document.createElement('button');
+    saveButton.onclick = function () {
+      var factory = new dwv.AnnotationGroupFactory();
+      var dicomElements = factory.toDicom(annotationGroup);
+      // write
+      var writer = new dwv.DicomWriter();
+      let dicomBuffer = null;
+      try {
+        dicomBuffer = writer.getBuffer(dicomElements);
+      } catch (error) {
+        console.error(error);
+        alert(error.message);
+      }
+      var blob = new Blob([dicomBuffer], {type: 'application/dicom'});
+
+      // temporary link to download
+      var element = document.createElement('a');
+      element.href = window.URL.createObjectURL(blob);
+      element.download = 'dicom-sr-' + dataId + '.dcm';
+      // trigger download
+      element.click();
+      URL.revokeObjectURL(element.href);
+    };
+    saveButton.setAttribute('class', 'ui-btn ui-btn-inline');
+    saveButton.appendChild(
+      document.createTextNode(dwvjq.i18n.t('basics.downloadAnnotations'))
+    );
+    node.appendChild(saveButton);
+
     // delete draw button
     var deleteButton = document.createElement('button');
     deleteButton.onclick = function () {