kfb-view 2.2.2 → 2.2.5

package/.idea/workspace.xml

@@ -46,8 +46,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>
@@ -71,35 +71,35 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;DefaultHtmlFileTemplate&quot;: &quot;HTML File&quot;,
-    &quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,
-    &quot;dart.analysis.tool.window.visible&quot;: &quot;false&quot;,
-    &quot;last_opened_file_path&quot;: &quot;/home/fanqifeng/WebstormProjects/kfb-view&quot;,
-    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
-    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
-    &quot;nodejs_interpreter_path&quot;: &quot;/home/fanqifeng/.nvm/versions/node/v10.15.1/bin/node&quot;,
-    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
-    &quot;settings.editor.selected.configurable&quot;: &quot;settings.nodejs&quot;,
-    &quot;ts.external.directory.path&quot;: &quot;/opt/WebStorm/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external&quot;,
-    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "DefaultHtmlFileTemplate": "HTML File",
+    "WebServerToolWindowFactoryState": "false",
+    "dart.analysis.tool.window.visible": "false",
+    "last_opened_file_path": "/home/fanqifeng/WebstormProjects/kfb-view/example",
+    "node.js.detected.package.eslint": "true",
+    "node.js.selected.package.eslint": "(autodetect)",
+    "nodejs_interpreter_path": "/home/fanqifeng/.nvm/versions/node/v10.15.1/bin/node",
+    "nodejs_package_manager_path": "npm",
+    "settings.editor.selected.configurable": "settings.nodejs",
+    "ts.external.directory.path": "/opt/WebStorm/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external",
+    "vue.rearranger.settings.migration": "true"
   }
-}</component>
+}]]></component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
+      <recent name="$PROJECT_DIR$/example" />
       <recent name="$PROJECT_DIR$/src/image" />
       <recent name="$PROJECT_DIR$/src/plugin" />
-      <recent name="$PROJECT_DIR$/example" />
       <recent name="$PROJECT_DIR$/src/components/cache" />
       <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.build:lib">
@@ -297,63 +297,21 @@
       <workItem from="1658365477621" duration="2695000" />
       <workItem from="1658371298489" duration="3932000" />
       <workItem from="1658393509298" duration="2844000" />
-      <workItem from="1658398367362" duration="819000" />
-    </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>
-    </task>
-    <task id="LOCAL-00040" summary="修复navigator中图片宽高一致时不显示">
-      <created>1632364163945</created>
-      <option name="number" value="00040" />
-      <option name="presentableId" value="LOCAL-00040" />
-      <option name="project" value="LOCAL" />
-      <updated>1632364163945</updated>
-    </task>
-    <task id="LOCAL-00041" summary="2.1.3">
-      <created>1632364173513</created>
-      <option name="number" value="00041" />
-      <option name="presentableId" value="LOCAL-00041" />
-      <option name="project" value="LOCAL" />
-      <updated>1632364173513</updated>
-    </task>
-    <task id="LOCAL-00042" summary="2.1.4">
-      <created>1632364377230</created>
-      <option name="number" value="00042" />
-      <option name="presentableId" value="LOCAL-00042" />
-      <option name="project" value="LOCAL" />
-      <updated>1632364377230</updated>
-    </task>
-    <task id="LOCAL-00043" summary="navigator 获取元素方式修改">
-      <created>1632379605009</created>
-      <option name="number" value="00043" />
-      <option name="presentableId" value="LOCAL-00043" />
-      <option name="project" value="LOCAL" />
-      <updated>1632379605009</updated>
-    </task>
-    <task id="LOCAL-00044" summary="chrome 49版本兼容">
-      <created>1634268789961</created>
-      <option name="number" value="00044" />
-      <option name="presentableId" value="LOCAL-00044" />
-      <option name="project" value="LOCAL" />
-      <updated>1634268789961</updated>
+      <workItem from="1658398367362" duration="1815000" />
+      <workItem from="1658401123366" duration="603000" />
+      <workItem from="1658513789094" duration="298000" />
+      <workItem from="1658666796644" duration="14873000" />
+      <workItem from="1658714844889" duration="5805000" />
+      <workItem from="1658796588637" duration="759000" />
+      <workItem from="1659404898003" duration="5697000" />
+      <workItem from="1659486429990" duration="597000" />
+      <workItem from="1659504598946" duration="598000" />
+      <workItem from="1659509611001" duration="599000" />
+      <workItem from="1659522580871" duration="599000" />
+      <workItem from="1659572503492" duration="1041000" />
+      <workItem from="1659582596490" duration="598000" />
+      <workItem from="1659683032926" duration="599000" />
+      <workItem from="1659952433819" duration="4309000" />
     </task>
     <task id="LOCAL-00045" summary="刻度线显示异常">
       <created>1634437932304</created>
@@ -642,7 +600,63 @@
       <option name="project" value="LOCAL" />
       <updated>1658398987163</updated>
     </task>
-    <option name="localTasksCounter" value="86" />
+    <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>
+    <task id="LOCAL-00089" summary="2.2.3">
+      <created>1658713100852</created>
+      <option name="number" value="00089" />
+      <option name="presentableId" value="LOCAL-00089" />
+      <option name="project" value="LOCAL" />
+      <updated>1658713100852</updated>
+    </task>
+    <task id="LOCAL-00090" summary="grid优化">
+      <created>1658715904288</created>
+      <option name="number" value="00090" />
+      <option name="presentableId" value="LOCAL-00090" />
+      <option name="project" value="LOCAL" />
+      <updated>1658715904291</updated>
+    </task>
+    <task id="LOCAL-00091" summary="触发限制优化">
+      <created>1659410472728</created>
+      <option name="number" value="00091" />
+      <option name="presentableId" value="LOCAL-00091" />
+      <option name="project" value="LOCAL" />
+      <updated>1659410472729</updated>
+    </task>
+    <task id="LOCAL-00092" summary="增加图片绘制">
+      <created>1659956040931</created>
+      <option name="number" value="00092" />
+      <option name="presentableId" value="LOCAL-00092" />
+      <option name="project" value="LOCAL" />
+      <updated>1659956040931</updated>
+    </task>
+    <task id="LOCAL-00093" summary="2.2.5">
+      <created>1659956059809</created>
+      <option name="number" value="00093" />
+      <option name="presentableId" value="LOCAL-00093" />
+      <option name="project" value="LOCAL" />
+      <updated>1659956059809</updated>
+    </task>
+    <option name="localTasksCounter" value="94" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -684,14 +698,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="闭合曲线" />
-    <MESSAGE value="2.1.16" />
-    <MESSAGE value="优化加载速度" />
-    <MESSAGE value="2.1.17" />
-    <MESSAGE value="2.1.18" />
-    <MESSAGE value="增加曲线开始点显示" />
-    <MESSAGE value="2.1.19" />
-    <MESSAGE value="绘制起点提示" />
     <MESSAGE value="曲线双击结束绘制" />
     <MESSAGE value="标注时增加右键拖动视野" />
     <MESSAGE value="曲线绘制中，按删除键，删除上一个标注点" />
@@ -709,7 +715,15 @@
     <MESSAGE value="index.js" />
     <MESSAGE value="导航轨迹显示" />
     <MESSAGE value="刻度线显示" />
-    <option name="LAST_COMMIT_MESSAGE" value="刻度线显示" />
+    <MESSAGE value="2.2.2" />
+    <MESSAGE value="增加网格线和标尺" />
+    <MESSAGE value="标注信息优化显示" />
+    <MESSAGE value="2.2.3" />
+    <MESSAGE value="grid优化" />
+    <MESSAGE value="触发限制优化" />
+    <MESSAGE value="增加图片绘制" />
+    <MESSAGE value="2.2.5" />
+    <option name="LAST_COMMIT_MESSAGE" value="2.2.5" />
     <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,6 +40,7 @@ instance.get(`/slide/info?file=${fileName}`).then(({data}) => {
       ROI: false,
     },
     graduation: {
+      show: true,
       left: 30,
       bottom: 10,
     },
@@ -48,12 +49,15 @@ instance.get(`/slide/info?file=${fileName}`).then(({data}) => {
       style: 'right: 0;top: 0',
       thumbnail: `/api/slide/getImage?file=${fileName}&type=thumbnail`,
       scale: data.scanScale,
-      vestigeZoom: .1,
     },
     pxConversion: {
       unit: 'um',
       imageCapRes: data.imageCapRes,
     },
+    grid: {
+      show: true,
+      ruler: true,
+    },
     openSeadragonOptions: {
       maxZoomLevel: data.scanScale * 10,
       // imageLoaderLimit: 1,
@@ -139,7 +143,7 @@ instance.get(`/slide/info?file=${fileName}`).then(({data}) => {
           }
           if (rangeB !== 0) {
             b = b * (1 + rangeB);
-            g = g > 255 ? 255 : g;
+            b = b > 255 ? 255 : b;
           }
           if (rangeS !== 0) {
             let {h, s, l} = rgbToHsl(r, g, b);
@@ -182,6 +186,17 @@ instance.get(`/slide/info?file=${fileName}`).then(({data}) => {
         size.y,
       );
     },
+    measure: {
+      handler(content, label) {
+        return [...content];
+      },
+    },
+    labelList: [
+      {
+        tool: 'Image',
+        points: [{x: 10000, y: 3000}, {x: 11000, y: 4000}],
+        src: `/api/slide/getImage?file=${fileName}&type=thumbnail`,
+      }],
   });
   /* kv.board.startDraw({
      tool: KfbView.marks.POLYGON,
@@ -189,7 +204,7 @@ instance.get(`/slide/info?file=${fileName}`).then(({data}) => {
   kv.viewer.addHandler('zoom', (res) => {
     const zoom = kv.viewer.viewport.viewportToImageZoom(res.zoom) *
       kv.$options.scale;
-    // console.log(zoom.toFixed(2) / 1);
+    console.log(zoom.toFixed(2) / 1);
   });
   console.log(kv);
   let list = [];
@@ -222,7 +237,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',
@@ -328,6 +343,9 @@ instance.get(`/slide/info?file=${fileName}`).then(({data}) => {
       });*/
   setTimeout(() => {
     // kv.destroy();
+    setTimeout(() => {
+      // kv.destroy();
+    }, 6000);
   }, 6000);
 
   // initLabels();