kfb-view 2.2.0 → 2.2.3

package/.idea/workspace.xml

@@ -48,8 +48,8 @@
     <option name="RECENT_TEMPLATES">
       <list>
         <option value="CSS File" />
-        <option value="JavaScript File" />
         <option value="HTML File" />
+        <option value="JavaScript File" />
       </list>
     </option>
   </component>
@@ -97,14 +97,14 @@
       <recent name="$PROJECT_DIR$/src/components/rotation" />
     </key>
     <key name="MoveFile.RECENT_KEYS">
+      <recent name="$PROJECT_DIR$/src/components/grid" />
       <recent name="$PROJECT_DIR$" />
       <recent name="$PROJECT_DIR$/src" />
       <recent name="$PROJECT_DIR$/example" />
       <recent name="$PROJECT_DIR$/src/tool" />
-      <recent name="$PROJECT_DIR$/src/components" />
     </key>
   </component>
-  <component name="RunManager" selected="npm.server:hot">
+  <component name="RunManager" selected="npm.build:lib">
     <configuration name="build:lib" type="js.build_tools.npm" temporary="true" nameIsGenerated="true">
       <package-json value="$PROJECT_DIR$/package.json" />
       <command value="run" />
@@ -293,77 +293,16 @@
       <workItem from="1657366256057" duration="578000" />
       <workItem from="1657519907711" duration="2848000" />
       <workItem from="1657527397247" duration="15173000" />
-      <workItem from="1657587519037" duration="15187000" />
-    </task>
-    <task id="LOCAL-00030" summary="优化Curve标注，增加组合">
-      <created>1631623386433</created>
-      <option name="number" value="00030" />
-      <option name="presentableId" value="LOCAL-00030" />
-      <option name="project" value="LOCAL" />
-      <updated>1631623386433</updated>
-    </task>
-    <task id="LOCAL-00031" summary="组合标注增加ellipse和rect">
-      <created>1631694555711</created>
-      <option name="number" value="00031" />
-      <option name="presentableId" value="LOCAL-00031" />
-      <option name="project" value="LOCAL" />
-      <updated>1631694555711</updated>
-    </task>
-    <task id="LOCAL-00032" summary="2.0.17">
-      <created>1631694823499</created>
-      <option name="number" value="00032" />
-      <option name="presentableId" value="LOCAL-00032" />
-      <option name="project" value="LOCAL" />
-      <updated>1631694823499</updated>
-    </task>
-    <task id="LOCAL-00033" summary="标签优化">
-      <created>1631756759803</created>
-      <option name="number" value="00033" />
-      <option name="presentableId" value="LOCAL-00033" />
-      <option name="project" value="LOCAL" />
-      <updated>1631756759803</updated>
-    </task>
-    <task id="LOCAL-00034" summary="标签优化">
-      <created>1631757323462</created>
-      <option name="number" value="00034" />
-      <option name="presentableId" value="LOCAL-00034" />
-      <option name="project" value="LOCAL" />
-      <updated>1631757323462</updated>
-    </task>
-    <task id="LOCAL-00035" summary="2.1.1">
-      <created>1631758578474</created>
-      <option name="number" value="00035" />
-      <option name="presentableId" value="LOCAL-00035" />
-      <option name="project" value="LOCAL" />
-      <updated>1631758578474</updated>
-    </task>
-    <task id="LOCAL-00036" summary="eslint">
-      <created>1631760254126</created>
-      <option name="number" value="00036" />
-      <option name="presentableId" value="LOCAL-00036" />
-      <option name="project" value="LOCAL" />
-      <updated>1631760254126</updated>
-    </task>
-    <task id="LOCAL-00037" summary="Curve is obsolete. Please use polygon instead">
-      <created>1631760521355</created>
-      <option name="number" value="00037" />
-      <option name="presentableId" value="LOCAL-00037" />
-      <option name="project" value="LOCAL" />
-      <updated>1631760521355</updated>
-    </task>
-    <task id="LOCAL-00038" summary="优化调整">
-      <created>1632362091089</created>
-      <option name="number" value="00038" />
-      <option name="presentableId" value="LOCAL-00038" />
-      <option name="project" value="LOCAL" />
-      <updated>1632362091089</updated>
-    </task>
-    <task id="LOCAL-00039" summary="2.1.2">
-      <created>1632362102053</created>
-      <option name="number" value="00039" />
-      <option name="presentableId" value="LOCAL-00039" />
-      <option name="project" value="LOCAL" />
-      <updated>1632362102053</updated>
+      <workItem from="1657587519037" duration="20593000" />
+      <workItem from="1657785384118" duration="336000" />
+      <workItem from="1658133724686" duration="5036000" />
+      <workItem from="1658365477621" duration="2695000" />
+      <workItem from="1658371298489" duration="3932000" />
+      <workItem from="1658393509298" duration="2844000" />
+      <workItem from="1658398367362" duration="1815000" />
+      <workItem from="1658401123366" duration="603000" />
+      <workItem from="1658513789094" duration="298000" />
+      <workItem from="1658666796644" duration="14031000" />
     </task>
     <task id="LOCAL-00040" summary="修复navigator中图片宽高一致时不显示">
       <created>1632364163945</created>
@@ -638,7 +577,77 @@
       <option name="project" value="LOCAL" />
       <updated>1657607397044</updated>
     </task>
-    <option name="localTasksCounter" value="79" />
+    <task id="LOCAL-00079" summary="2.20.0">
+      <created>1657607434015</created>
+      <option name="number" value="00079" />
+      <option name="presentableId" value="LOCAL-00079" />
+      <option name="project" value="LOCAL" />
+      <updated>1657607434015</updated>
+    </task>
+    <task id="LOCAL-00080" summary="2.2.0">
+      <created>1657607449348</created>
+      <option name="number" value="00080" />
+      <option name="presentableId" value="LOCAL-00080" />
+      <option name="project" value="LOCAL" />
+      <updated>1657607449348</updated>
+    </task>
+    <task id="LOCAL-00081" summary="加载速度优化">
+      <created>1657612318446</created>
+      <option name="number" value="00081" />
+      <option name="presentableId" value="LOCAL-00081" />
+      <option name="project" value="LOCAL" />
+      <updated>1657612318447</updated>
+    </task>
+    <task id="LOCAL-00082" summary="2.2.1">
+      <created>1657612343466</created>
+      <option name="number" value="00082" />
+      <option name="presentableId" value="LOCAL-00082" />
+      <option name="project" value="LOCAL" />
+      <updated>1657612343466</updated>
+    </task>
+    <task id="LOCAL-00083" summary="index.js">
+      <created>1657785699795</created>
+      <option name="number" value="00083" />
+      <option name="presentableId" value="LOCAL-00083" />
+      <option name="project" value="LOCAL" />
+      <updated>1657785699797</updated>
+    </task>
+    <task id="LOCAL-00084" summary="导航轨迹显示">
+      <created>1658394875542</created>
+      <option name="number" value="00084" />
+      <option name="presentableId" value="LOCAL-00084" />
+      <option name="project" value="LOCAL" />
+      <updated>1658394875543</updated>
+    </task>
+    <task id="LOCAL-00085" summary="刻度线显示">
+      <created>1658398987159</created>
+      <option name="number" value="00085" />
+      <option name="presentableId" value="LOCAL-00085" />
+      <option name="project" value="LOCAL" />
+      <updated>1658398987163</updated>
+    </task>
+    <task id="LOCAL-00086" summary="2.2.2">
+      <created>1658399404095</created>
+      <option name="number" value="00086" />
+      <option name="presentableId" value="LOCAL-00086" />
+      <option name="project" value="LOCAL" />
+      <updated>1658399404095</updated>
+    </task>
+    <task id="LOCAL-00087" summary="增加网格线和标尺">
+      <created>1658710072174</created>
+      <option name="number" value="00087" />
+      <option name="presentableId" value="LOCAL-00087" />
+      <option name="project" value="LOCAL" />
+      <updated>1658710072175</updated>
+    </task>
+    <task id="LOCAL-00088" summary="标注信息优化显示">
+      <created>1658713081785</created>
+      <option name="number" value="00088" />
+      <option name="presentableId" value="LOCAL-00088" />
+      <option name="project" value="LOCAL" />
+      <updated>1658713081785</updated>
+    </task>
+    <option name="localTasksCounter" value="89" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -680,16 +689,6 @@
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
     <option name="LOCAL_CHANGES_DETAILS_PREVIEW_SHOWN" value="false" />
-    <MESSAGE value="2.1.12 导出OpenSeadragon" />
-    <MESSAGE value="重写绘制逻辑" />
-    <MESSAGE value="package.json" />
-    <MESSAGE value="组合框异常" />
-    <MESSAGE value="2.1.14" />
-    <MESSAGE value="闭合区域" />
-    <MESSAGE value="2.1.15" />
-    <MESSAGE value="闭合曲线" />
-    <MESSAGE value="2.1.16" />
-    <MESSAGE value="优化加载速度" />
     <MESSAGE value="2.1.17" />
     <MESSAGE value="2.1.18" />
     <MESSAGE value="增加曲线开始点显示" />
@@ -705,7 +704,17 @@
     <MESSAGE value="优化选中点" />
     <MESSAGE value="优化标注图形显示，一次最多绘制5000个点，超过的标注延迟加载" />
     <MESSAGE value="键盘事件更新，delete可删除曲线标注点，双击可添加曲线标注点" />
-    <option name="LAST_COMMIT_MESSAGE" value="键盘事件更新，delete可删除曲线标注点，双击可添加曲线标注点" />
+    <MESSAGE value="2.20.0" />
+    <MESSAGE value="2.2.0" />
+    <MESSAGE value="加载速度优化" />
+    <MESSAGE value="2.2.1" />
+    <MESSAGE value="index.js" />
+    <MESSAGE value="导航轨迹显示" />
+    <MESSAGE value="刻度线显示" />
+    <MESSAGE value="2.2.2" />
+    <MESSAGE value="增加网格线和标尺" />
+    <MESSAGE value="标注信息优化显示" />
+    <option name="LAST_COMMIT_MESSAGE" value="标注信息优化显示" />
     <option name="REFORMAT_BEFORE_PROJECT_COMMIT" value="true" />
   </component>
   <component name="XSLT-Support.FileAssociations.UIState">

package/config/webpack.dev.conf.js

@@ -65,9 +65,10 @@ module.exports = function() {
           context: ['/api', '/image.php', '/process.php'],
           // target: 'http://gastric.label.hzztai.com/',
           // target: 'http://192.168.1.91:7007',
-          target: 'http://192.168.1.91',
+          // target: 'http://192.168.1.91',
           // target: 'https://tct.hzztai.com',
           //  target: 'https://pis-ningbo.hzztai.com',
+          target: 'https://pis-test.hzztai.com',
           secure: false,
           changeOrigin: true,
         },

package/example/index.js

@@ -2,7 +2,7 @@ import {KfbView, hslToRgb, rgbToHsl, cacheGammaTable} from '../src';
 import axios from 'axios';
 import {EVENT_DB_CLICK_LABEL} from '../src/const/event';
 
-const fileName = '/upload/large_file/last/2022/04/26/d31a31bf1ae5b73fca63f72e2affc879/胃镜1.kfb';
+const fileName = '/upload/large_file/last/2022/06/22/3625ce6de8197c7315ce9e05b4ef233b/IHC.kfb';
 
 const instance = axios.create({
   baseURL: '/api',
@@ -40,15 +40,22 @@ instance.get(`/slide/info?file=${fileName}`).then(({data}) => {
       ROI: false,
     },
     graduation: {
-      right: 30,
+      left: 30,
+      bottom: 10,
     },
     navigator: {
       disabled: false,
-      height: 200,
       style: 'right: 0;top: 0',
       thumbnail: `/api/slide/getImage?file=${fileName}&type=thumbnail`,
-      vestige: true,
-      vestigeZoom: .1,
+      scale: data.scanScale,
+    },
+    pxConversion: {
+      unit: 'um',
+      imageCapRes: data.imageCapRes,
+    },
+    grid: {
+      show: true,
+      ruler: true,
     },
     openSeadragonOptions: {
       maxZoomLevel: data.scanScale * 10,
@@ -178,10 +185,20 @@ instance.get(`/slide/info?file=${fileName}`).then(({data}) => {
         size.y,
       );
     },
+    measure: {
+      handler(content, label) {
+        return [...content, '标注人： xxx'];
+      },
+    },
   });
   /* kv.board.startDraw({
      tool: KfbView.marks.POLYGON,
    });*/
+  kv.viewer.addHandler('zoom', (res) => {
+    const zoom = kv.viewer.viewport.viewportToImageZoom(res.zoom) *
+      kv.$options.scale;
+    console.log(zoom.toFixed(2) / 1);
+  });
   console.log(kv);
   let list = [];
   document.querySelector('#a').onchange = debounce(changeRange, 500);
@@ -213,7 +230,7 @@ instance.get(`/slide/info?file=${fileName}`).then(({data}) => {
       lineWidth: 10,
       isROI: false,
       once: true,
-      measure: false,
+      measure: true,
       resize: false,
       move: false,
       fillStyle: '#ff00ff8d',
@@ -319,22 +336,29 @@ instance.get(`/slide/info?file=${fileName}`).then(({data}) => {
       });*/
   setTimeout(() => {
     // kv.destroy();
+    kv.navigator.toggleNavigator();
+    setTimeout(() => {
+      // kv.destroy();
+      kv.navigator.toggleNavigator();
+    }, 6000);
   }, 6000);
-  initLabels();
+
+  // initLabels();
 
   function initLabels() {
     const labels = [];
-    for (let i = 0; i < 1000; i++) {
+    const colors = ['#027AFF', '#f56c6c'];
+    for (let i = 0; i < 50000; i++) {
       const point = {
-        x: data.width / 2 + Math.random() * 10000,
-        y: data.height / 2 + Math.random() * 10000,
+        x: Math.random() * data.width,
+        y: Math.random() * data.height,
       };
       const label = {
         // fillStyle: 'rgba(2, 122, 255, 1)',
         lineWidth: 6,
         points: [point, point],
         scale: 0.1,
-        strokeStyle: '#027AFF',
+        strokeStyle: Math.random() > .5 ? colors[0] : colors[1],
         tool: 'Dot',
         move: false,
       };