Split draw and annotation group demo viewer code

ivmartel · Aug 28, 2024 · a57d43e · a57d43e
1 parent 412b4b5
commit a57d43e
Show file tree

Hide file tree

Showing 4 changed files with 359 additions and 348 deletions.
diff --git a/tests/pacs/viewer.html b/tests/pacs/viewer.html
@@ -36,7 +36,7 @@
   font-style: italic;
 }
 button {
-  margin: 0 5px;
+  margin: 0 3px;
 }
 input[type=number] {
   width: 75px;
@@ -59,6 +59,10 @@
     font-style: italic;
   }
 }
+fieldset ul {
+  padding-left: 20px;
+  margin: 0;
+}
 #fileinput {
   width: 50%;
   border: 1px dotted gray;
@@ -140,6 +144,7 @@
 <script type="text/javascript" src="./dist/dwv.min.js"></script>
 --><!-- local -->
 <script type="text/javascript" src="./viewer.ui.js"></script>
+<script type="text/javascript" src="./viewer.ui.annot.js"></script>
 <script type="text/javascript" src="./viewer.ui.draw.js"></script>
 <script type="text/javascript" src="./viewer.datatable.js"></script>
 <script type="text/javascript" src="./viewer.rendertest.js"></script>
@@ -185,6 +190,8 @@
   </fieldset>
 </div>
 
+<div id='annotationgroups-panel' class="line"></div>
+
 <div id="layersdetails"></div>
 
 <br>

diff --git a/tests/pacs/viewer.js b/tests/pacs/viewer.js
@@ -315,11 +315,16 @@ function viewerSetup() {
   for (const toolName in _tools) {
     if (typeof test.toolFeaturesUI[toolName] !== 'undefined') {
       const toolUI = new test.toolFeaturesUI[toolName](_app, _tools[toolName]);
-      toolUI.registerListeners();
       _toolFeaturesUI[toolName] = toolUI;
     }
   }
 
+  // annotation UI
+  if (typeof test.ui.Annotation !== 'undefined') {
+    const annotUI = new test.ui.Annotation(_app);
+    annotUI.registerListeners();
+  }
+
   const uriOptions = {};
   // uriOptions.batchSize = 100;
   // special dicom web cookie