histomicsui 1.7.3.dev89__tar.gz → 1.7.3.dev93__tar.gz

{histomicsui-1.7.3.dev89 → histomicsui-1.7.3.dev93}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: histomicsui
-Version: 1.7.3.dev89
+Version: 1.7.3.dev93
 Summary: Organize, visualize, and analyze histology images.
 Home-page: https://github.com/DigitalSlideArchive/histomicsui
 Author: Kitware, Inc.
@@ -19,7 +19,7 @@ Requires-Python: >=3.10
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 License-File: NOTICE
-Requires-Dist: girder-large-image-annotation>=1.32.8
+Requires-Dist: girder-large-image-annotation>=1.33.5
 Requires-Dist: girder-slicer-cli-web[girder]>=1.4.0
 Requires-Dist: cachetools
 Requires-Dist: orjson

{histomicsui-1.7.3.dev89 → histomicsui-1.7.3.dev93}/histomicsui/web_client/dialogs/editElement.js

@@ -79,6 +79,8 @@ var EditElement = View.extend({
         if (fillColor) {
             data.fillColor = this.convertColor(fillColor);
         }
+        var pattern = this.$('#h-element-fill-pattern').val();
+        data.pattern = pattern === 'none' ? undefined : pattern;
 
         if (validation) {
             this.$('.g-validation-failed-message').text(validation)

{histomicsui-1.7.3.dev89 → histomicsui-1.7.3.dev93}/histomicsui/web_client/dialogs/editStyleGroups.js

@@ -88,6 +88,8 @@ const EditStyleGroups = View.extend({
         if (fillColor) {
             data.fillColor = this.convertColor(fillColor);
         }
+        var pattern = this.$('#h-element-fill-pattern').val();
+        data.pattern = pattern === 'none' ? undefined : pattern;
 
         if (validation) {
             this.$('.g-validation-failed-message').text(validation)

{histomicsui-1.7.3.dev89 → histomicsui-1.7.3.dev93}/histomicsui/web_client/models/StyleModel.js

@@ -1,7 +1,7 @@
 import _ from 'underscore';
 import Backbone from 'backbone';
 
-const AllowedKeys = ['fillColor', 'lineColor', 'lineWidth', 'label', 'group', 'id'];
+const AllowedKeys = ['fillColor', 'lineColor', 'lineWidth', 'label', 'group', 'id', 'pattern'];
 
 const StyleModel = Backbone.Model.extend({
     defaults: {

{histomicsui-1.7.3.dev89 → histomicsui-1.7.3.dev93}/histomicsui/web_client/panels/DrawWidget.js

@@ -402,7 +402,7 @@ var DrawWidget = Panel.extend({
                 return false;
             }
         } else {
-            const ptlist = annotations[0].coordinates().map((p) => [p.x, p.y]);
+            const ptlist = annotations[0].coordinates(null).map((p) => [p.x, p.y]);
             if (ptlist.length === 2) {
                 ptlist.splice(1, 0, [(ptlist[0][0] + ptlist[1][0]) / 2, (ptlist[0][1] + ptlist[1][1]) / 2]);
             }
@@ -882,7 +882,7 @@ var DrawWidget = Panel.extend({
     _setStyleGroup(group) {
         group = Object.assign({}, group);
         Object.keys(group).forEach((k) => {
-            if (!['fillColor', 'lineColor', 'lineWidth', 'label', 'group', 'id'].includes(k)) {
+            if (!['fillColor', 'lineColor', 'lineWidth', 'label', 'group', 'id', 'pattern'].includes(k)) {
                 delete group[k];
             }
         });

histomicsui-1.7.3.dev93/histomicsui/web_client/templates/dialogs/editElement.pug

@@ -0,0 +1,24 @@
+if element.type === 'heatmap' || element.type === 'griddata'
+  .vue-component-heatmap
+else
+  .modal-dialog(role='document')
+    .modal-content
+      form.modal-form(role='form')
+        .modal-header
+          button.close(type='button', data-dismiss='modal', aria-label='Close')
+            span(aria-hidden='true') ×
+          h4.modal-title Edit annotation
+        .modal-body
+          if element.type === 'heatmap' || element.type === 'griddata'
+            .vue-component-heatmap1111
+          else
+            - element.label = element.label || {};
+            .form-group
+              label(for='h-group-name') Group Name
+              input#h-group-name.input-sm.form-control(
+                type='text', placeholder='Enter an optional group name for the element', value=element.group)
+            include ../elementProps.pug
+            +elementProps(element)
+      .modal-footer
+        button.btn.btn-default(type='button', data-dismiss='modal') Cancel
+        button.btn.btn-primary.h-submit(type='submit') Save

{histomicsui-1.7.3.dev89 → histomicsui-1.7.3.dev93}/histomicsui/web_client/templates/dialogs/editStyleGroups.pug

@@ -28,29 +28,9 @@
                     span.icon-minus(data-toggle='tooltip', title='Delete the listed style')
                 button.btn.btn-default.h-create-new-style
                   span.icon-plus(data-toggle='tooltip', title='Create a new style')
-        .form-group
-          label(for='h-element-label') Label
-          input#h-element-label.h-style-def.input-sm.form-control(
-            type='text', placeholder='Enter an optional label applied to all elements', value=label.value)
-        .form-group
-          label(for='h-element-line-width') Line width
-          input#h-element-line-width.h-style-def.input-sm.form-control(
-            type='number', min=0, step=0.1, value=model.get('lineWidth'))
-        .form-group
-          label(for='h-element-line-color') Line color
-          .input-group.h-colorpicker
-            input#h-element-line-color.input-sm.form-control(
-              type='text', value=model.get('lineColor'))
-            span.input-group-addon
-              i
-        .form-group
-          label(for='h-element-fill-color') Fill color
-          .input-group.h-colorpicker
-            input#h-element-fill-color.input-sm.form-control(
-              type='text', value=model.get('fillColor'))
-            span.input-group-addon
-              i
-        .g-validation-failed-message.hidden
+        include ../elementProps.pug
+        +elementProps(model.attributes)
+
       .modal-footer
         button#h-reset-defaults.btn.btn-sm.btn-default.h-btn-left(type='button') Reset to Defaults
         if user.get && user.get('admin')

histomicsui-1.7.3.dev93/histomicsui/web_client/templates/elementProps.pug

@@ -0,0 +1,44 @@
+mixin elementProps(element)
+  .form-group
+    label(for='h-element-label') Label
+    input#h-element-label.input-sm.form-control(
+      type='text', placeholder='Enter an optional label for the element', value=(element.label || {}).value)
+  .form-group
+    label(for='h-element-line-width') Line width
+    input#h-element-line-width.input-sm.form-control(
+      type='number', min=0, step=0.1, value=element.lineWidth)
+  .form-group
+    label(for='h-element-line-color') Line color
+    .input-group.h-colorpicker
+      input#h-element-line-color.input-sm.form-control(
+        type='text', value=element.lineColor)
+      span.input-group-addon
+        i
+  .form-group
+    label(for='h-element-fill-color') Fill color
+    .input-group.h-colorpicker
+      input#h-element-fill-color.input-sm.form-control(
+        type='text', value=element.fillColor)
+      span.input-group-addon
+        i
+  .form-group
+    label(for='h-element-fill-pattern') Fill pattern
+    -
+      var patterns = [
+        {key: 'none', label: 'None'},
+        {key: 'circle', label: 'Circle'},
+        {key: 'triangle', label: 'Triangle'},
+        {key: 'diamond', label: 'Diamond'},
+        {key: 'flower3', label: 'Flower 3'},
+        {key: 'flower5', label: 'Flower 5'},
+        {key: 'flower8', label: 'Flower 8'},
+        {key: 'star3', label: 'Star 3'},
+        {key: 'star5', label: 'Star 5'},
+        {key: 'star8', label: 'Star 8'},
+        {key: 'jack3', label: 'Jack 3'},
+        {key: 'jack5', label: 'Jack 5'},
+        {key: 'jack8', label: 'Jack 8'}]
+    select#h-element-fill-pattern.form-control
+      each opt in patterns
+        option(value=opt.key, selected=element.pattern === opt.key) #{opt.label}
+  .g-validation-failed-message.hidden

{histomicsui-1.7.3.dev89 → histomicsui-1.7.3.dev93}/histomicsui/web_client/views/body/ImageView.js

@@ -232,6 +232,7 @@ var ImageView = View.extend({
                 events.trigger('h:imageOpened', this.model);
                 // store a reference to the underlying viewer
                 this.viewer = this.viewerWidget.viewer;
+                this.annotations._viewer = this.viewerWidget;
                 this.viewer.interactor().removeAction(geo.geo_action.zoomselect);
 
                 const currentOptions = this.viewer.interactor().options();

{histomicsui-1.7.3.dev89 → histomicsui-1.7.3.dev93}/histomicsui/web_client/views/popover/AnnotationContextMenu.js

@@ -63,7 +63,7 @@ const AnnotationContextMenu = View.extend({
         const style = this.styles.get({id: group}) || this.styles.get({id: this.parentView._defaultGroup});
         const styleAttrs = Object.assign({}, style ? style.toJSON() : {});
         Object.keys(styleAttrs).forEach((k) => {
-            if (!['fillColor', 'lineColor', 'lineWidth', 'label'].includes(k)) {
+            if (!['fillColor', 'lineColor', 'lineWidth', 'label', 'pattern'].includes(k)) {
                 delete styleAttrs[k];
             }
         });

{histomicsui-1.7.3.dev89 → histomicsui-1.7.3.dev93}/histomicsui.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: histomicsui
-Version: 1.7.3.dev89
+Version: 1.7.3.dev93
 Summary: Organize, visualize, and analyze histology images.
 Home-page: https://github.com/DigitalSlideArchive/histomicsui
 Author: Kitware, Inc.
@@ -19,7 +19,7 @@ Requires-Python: >=3.10
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 License-File: NOTICE
-Requires-Dist: girder-large-image-annotation>=1.32.8
+Requires-Dist: girder-large-image-annotation>=1.33.5
 Requires-Dist: girder-slicer-cli-web[girder]>=1.4.0
 Requires-Dist: cachetools
 Requires-Dist: orjson

{histomicsui-1.7.3.dev89 → histomicsui-1.7.3.dev93}/histomicsui.egg-info/SOURCES.txt

@@ -101,6 +101,7 @@ histomicsui/web_client/stylesheets/popover/annotationContextMenu.styl
 histomicsui/web_client/stylesheets/popover/annotationPopover.styl
 histomicsui/web_client/stylesheets/views/itemList.styl
 histomicsui/web_client/stylesheets/views/searchResultsView.styl
+histomicsui/web_client/templates/elementProps.pug
 histomicsui/web_client/templates/body/configView.pug
 histomicsui/web_client/templates/body/image.pug
 histomicsui/web_client/templates/dialogs/annotatedImageList.pug

{histomicsui-1.7.3.dev89 → histomicsui-1.7.3.dev93}/histomicsui.egg-info/requires.txt

@@ -1,4 +1,4 @@
-girder-large-image-annotation>=1.32.8
+girder-large-image-annotation>=1.33.5
 girder-slicer-cli-web[girder]>=1.4.0
 cachetools
 orjson

{histomicsui-1.7.3.dev89 → histomicsui-1.7.3.dev93}/setup.py

@@ -41,7 +41,7 @@ setup(
         'Programming Language :: Python :: 3.13',
     ],
     install_requires=[
-        'girder-large-image-annotation>=1.32.8',
+        'girder-large-image-annotation>=1.33.5',
         'girder-slicer-cli-web[girder]>=1.4.0',
         'cachetools',
         'orjson',

histomicsui-1.7.3.dev89/histomicsui/web_client/templates/dialogs/editElement.pug

@@ -1,45 +0,0 @@
-if element.type === 'heatmap' || element.type === 'griddata'
-  .vue-component-heatmap
-else
-  .modal-dialog(role='document')
-    .modal-content
-      form.modal-form(role='form')
-        .modal-header
-          button.close(type='button', data-dismiss='modal', aria-label='Close')
-            span(aria-hidden='true') ×
-          h4.modal-title Edit annotation
-        .modal-body
-          if element.type === 'heatmap' || element.type === 'griddata'
-            .vue-component-heatmap1111
-          else
-            - element.label = element.label || {};
-            .form-group
-              label(for='h-group-name') Group Name
-              input#h-group-name.input-sm.form-control(
-                type='text', placeholder='Enter an optional group name for the element', value=element.group)
-            .form-group
-              label(for='h-element-label') Label
-              input#h-element-label.input-sm.form-control(
-                type='text', placeholder='Enter an optional label for the element', value=element.label.value)
-            .form-group
-              label(for='h-element-line-width') Line width
-              input#h-element-line-width.input-sm.form-control(
-                type='number', min=0, step=0.1, value=element.lineWidth)
-            .form-group
-              label(for='h-element-line-color') Line color
-              .input-group.h-colorpicker
-                input#h-element-line-color.input-sm.form-control(
-                  type='text', value=element.lineColor)
-                span.input-group-addon
-                  i
-            .form-group
-              label(for='h-element-fill-color') Fill color
-              .input-group.h-colorpicker
-                input#h-element-fill-color.input-sm.form-control(
-                  type='text', value=element.fillColor)
-                span.input-group-addon
-                  i
-            .g-validation-failed-message.hidden
-      .modal-footer
-        button.btn.btn-default(type='button', data-dismiss='modal') Cancel
-        button.btn.btn-primary.h-submit(type='submit') Save