Merge pull request #297 from ivmartel/294-add-save-annot

294 add save annot

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",

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",

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",

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",

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",

resources/locales/jp/translation.json

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

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",

resources/locales/ru/translation.json

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

resources/locales/zh/translation.json

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

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);

src/gui/generic.js

@@ -310,7 +310,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);
@@ -558,6 +558,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 () {