histomicsui 1.6.1.dev4__tar.gz → 1.6.1.dev6__tar.gz

{histomicsui-1.6.1.dev4/histomicsui.egg-info → histomicsui-1.6.1.dev6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: histomicsui
-Version: 1.6.1.dev4
+Version: 1.6.1.dev6
 Summary: Organize, visualize, and analyze histology images.
 Home-page: https://github.com/DigitalSlideArchive/histomicsui
 Author: Kitware, Inc.

histomicsui-1.6.1.dev6/histomicsui/web_client/stylesheets/layout/headerAnalyses.styl

@@ -0,0 +1,98 @@
+ul.h-analyses-dropdown
+  min-width 120px
+
+  li > a
+    padding 3px 20px
+
+  .dropdown-menu
+    min-width 120px
+
+ul.dropdown-menu[row_offset="1"]
+  top -26px
+
+ul.dropdown-menu[row_offset="2"]
+  top -52px
+
+ul.dropdown-menu[row_offset="3"]
+  top -78px
+
+ul.dropdown-menu[row_offset="4"]
+  top -104px
+
+ul.dropdown-menu[row_offset="5"]
+  top -130px
+
+ul.dropdown-menu[row_offset="6"]
+  top -156px
+
+ul.dropdown-menu[row_offset="7"]
+  top -182px
+
+ul.dropdown-menu[row_offset="8"]
+  top -208px
+
+ul.dropdown-menu[row_offset="9"]
+  top -234px
+
+ul.dropdown-menu[row_offset="10"]
+  top -260px
+
+ul.dropdown-menu[row_offset="11"]
+  top -286px
+
+ul.dropdown-menu[row_offset="12"]
+  top -312px
+
+ul.dropdown-menu[row_offset="13"]
+  top -338px
+
+ul.dropdown-menu[row_offset="14"]
+  top -364px
+
+ul.dropdown-menu[row_offset="15"]
+  top -390px
+
+ul.dropdown-menu[row_offset="16"]
+  top -416px
+
+ul.dropdown-menu[row_offset="17"]
+  top -442px
+
+ul.dropdown-menu[row_offset="18"]
+  top -468px
+
+ul.dropdown-menu[row_offset="19"]
+  top -494px
+
+ul.dropdown-menu[row_offset="20"]
+  top -520px
+
+ul.dropdown-menu[row_offset="21"]
+  top -546px
+
+ul.dropdown-menu[row_offset="22"]
+  top -572px
+
+ul.dropdown-menu[row_offset="23"]
+  top -598px
+
+ul.dropdown-menu[row_offset="24"]
+  top -624px
+
+ul.dropdown-menu[row_offset="25"]
+  top -650px
+
+ul.dropdown-menu[row_offset="26"]
+  top -676px
+
+ul.dropdown-menu[row_offset="27"]
+  top -702px
+
+ul.dropdown-menu[row_offset="28"]
+  top -728px
+
+ul.dropdown-menu[row_offset="29"]
+  top -754px
+
+ul.dropdown-menu[row_offset="30"]
+  top -780px

{histomicsui-1.6.1.dev4 → histomicsui-1.6.1.dev6}/histomicsui/web_client/templates/layout/headerAnalyses.pug

@@ -1,11 +1,15 @@
-mixin analysisMenu(image, imageName)
+mixin analysisMenu(image, imageName, pos, maxRows)
   li.dropdown-submenu
     a(tabindex='0', href='#', data-name=imageName) #{imageName}
-    ul.dropdown-menu
+    -
+      let finalv = pos + Object.keys(image).length
+      let posv = pos - (finalv > maxRows ? finalv - maxRows : 0)
+    ul.dropdown-menu(row_offset=finalv > maxRows ? finalv - maxRows : 0)
       each version, versionName in image
         li.dropdown-submenu
           a(tabindex='0', href='#') #{versionName}
-          ul.dropdown-menu
+          - let finalc = posv + Object.keys(version).length
+          ul.dropdown-menu(row_offset=finalc > maxRows ? finalc - maxRows : 0)
             each cli, cliName in version
               - var api = cli.run.replace(/\/run$/, '');
               li
@@ -16,59 +20,76 @@ mixin analysisMenu(image, imageName)
                     data-image=imageName,
                     data-version=versionName,
                     data-cli=cliName) #{cliName}
+        - posv += 1
 
 a.h-analyses-dropdown-link(data-toggle='dropdown')
   | #[span.icon-tasks] Analyses #[span.icon-down-open]
 -
   let depth = 0;
-  let rows = maxEntries;
+  let rows = maxRows;
   let keyList = Object.keys(analyses).sort();
   let entries = keyList.length;
-  if (entries > maxEntries * maxEntries * maxEntries) {
+  if (entries > maxRows * maxRows * maxRows) {
     rows = Math.ceil(Math.pow(entries, 1./3));
   }
-  if (entries > maxEntries * maxEntries) {
+  if (entries > maxRows * maxRows) {
     depth = 2;
-  } else if (entries > maxEntries) {
+  } else if (entries > maxRows) {
     depth = 1;
   }
-if depth === 2
-  ul.h-analyses-dropdown.dropdown-menu(role='menu')
+ul.h-analyses-dropdown.dropdown-menu(role='menu')
+  if depth === 2
+    - let pos2 = 0
     for d2v, d2i in Array(Math.ceil(entries / rows / rows))
       -
         let start2 = d2i * rows * rows;
         let end2 = Math.min((d2i + 1) * rows * rows, entries);
       li.dropdown-submenu
         a(tabindex='0', href='#', title=keyList[start2] + ' to ' + keyList[end2 - 1]) #{start2 + 1} to #{end2}
-        ul.dropdown-menu
+        -
+          let final1 = pos1 + (end2 - start2)
+          let pos1 = pos2 - (final1 > maxRows ? final1 - maxRows : 0)
+        ul.dropdown-menu(row_offset=final1 > maxRows ? final1 - maxRows : 0)
           for d1v, d1i in Array(Math.ceil((end2 - start2) / rows))
             -
               let start1 = start2 + d1i * rows;
               let end1 = Math.min(start2 + (d1i + 1) * rows, entries);
             li.dropdown-submenu
               a(tabindex='0', href='#', title=keyList[start1] + ' to ' + keyList[end1 - 1]) #{start1 + 1} to #{end1}
-              ul.dropdown-menu
+              -
+                let final0 = pos1 + (end1 - start1)
+                let pos0 = pos1 - (final0 > maxRows ? final0 - maxRows : 0)
+              ul.dropdown-menu(row_offset=final0 > maxRows ? final0 - maxRows : 0)
                 for d0v, d0i in Array(end1 - start1)
                   -
                     let imageName = keyList[start1 + d0i];
                     let image = analyses[imageName];
-                  +analysisMenu(image, imageName)
-else if depth === 1
-  ul.h-analyses-dropdown.dropdown-menu(role='menu')
+                  +analysisMenu(image, imageName, pos0, maxRows)
+                  - pos0 += 1
+            - pos1 += 1
+        - pos2 += 1
+  else if depth === 1
+    - let pos1 = 0
     for d1v, d1i in Array(Math.ceil(entries / rows))
       -
         let start1 = d1i * rows;
         let end1 = Math.min((d1i + 1) * rows, entries);
       li.dropdown-submenu
         a(tabindex='0', href='#', title=keyList[start1] + ' to ' + keyList[end1 - 1]) #{start1 + 1} to #{end1}
-        ul.dropdown-menu
+        -
+          let final0 = pos1 + (end1 - start1)
+          let pos0 = pos1 - (final0 > maxRows ? final0 - maxRows : 0)
+        ul.dropdown-menu(row_offset=final0 > maxRows ? final0 - maxRows : 0)
           for d0v, d0i in Array(end1 - start1)
             -
               let imageName = keyList[start1 + d0i];
               let image = analyses[imageName];
-            +analysisMenu(image, imageName)
-else
-  ul.h-analyses-dropdown.dropdown-menu(role='menu')
+            +analysisMenu(image, imageName, pos0, maxRows)
+            - pos0 += 1
+      - pos1 += 1
+  else
+    - let pos0 = 0
     each imageName in keyList
       - let image = analyses[imageName];
-      +analysisMenu(image, imageName)
+      +analysisMenu(image, imageName, pos0, maxRows)
+      - pos0 += 1

{histomicsui-1.6.1.dev4 → histomicsui-1.6.1.dev6}/histomicsui/web_client/views/layout/HeaderAnalysesView.js

@@ -27,15 +27,12 @@ var HeaderUserView = View.extend({
             restRequest({
                 url: 'slicer_cli_web/docker_image'
             }).then((analyses) => {
-                let maxEntries = Math.max(10, Math.floor(($('.h-image-view-body').height() || 0) / 26) - 10);
-                if (Object.keys(analyses).length > maxEntries * maxEntries) {
-                    maxEntries = Math.max(10, Math.floor((($('.h-image-view-body').height() || 0) / 26 - 10) / 2));
-                }
+                const maxRows = Math.max(5, Math.floor((($('.h-image-view-body').height() || 0) - 8) / 26));
                 if (_.keys(analyses || {}).length > 0) {
                     this.$el.removeClass('hidden');
                     this.$el.html(headerAnalysesTemplate({
                         analyses: analyses || {},
-                        maxEntries: maxEntries
+                        maxRows: maxRows
                     }));
                     this.$('.h-analyses-dropdown-link').submenupicker();
                 } else {

{histomicsui-1.6.1.dev4 → histomicsui-1.6.1.dev6/histomicsui.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: histomicsui
-Version: 1.6.1.dev4
+Version: 1.6.1.dev6
 Summary: Organize, visualize, and analyze histology images.
 Home-page: https://github.com/DigitalSlideArchive/histomicsui
 Author: Kitware, Inc.

histomicsui-1.6.1.dev4/histomicsui/web_client/stylesheets/layout/headerAnalyses.styl

@@ -1,8 +0,0 @@
-ul.h-analyses-dropdown
-  min-width 120px
-
-  li > a
-    padding 3px 20px
-
-  .dropdown-menu
-    min-width 120px