kfb-view 2.2.8 → 2.3.0

package/.idea/workspace.xml

@@ -37,11 +37,8 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="55024232-8108-4dc9-9bd3-0fd2aa2f34f8" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/example/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/example/index.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/package.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/components/board/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/board/index.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/plugin/openseadragon/openseadragon.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/plugin/openseadragon/openseadragon.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/tool/Brush.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/tool/Brush.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/components/area/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/area/index.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/view.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/view.js" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -77,21 +74,22 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <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",
-    "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 name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;DefaultHtmlFileTemplate&quot;: &quot;HTML File&quot;,
+    &quot;Project.color&quot;: &quot;4c401d&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>
+}</component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
       <recent name="$PROJECT_DIR$/example" />
@@ -323,63 +321,24 @@
       <workItem from="1660291265906" duration="622000" />
       <workItem from="1660354678944" duration="1028000" />
       <workItem from="1660372146258" duration="2000" />
-      <workItem from="1660524325887" duration="4805000" />
-    </task>
-    <task id="LOCAL-00045" summary="刻度线显示异常">
-      <created>1634437932304</created>
-      <option name="number" value="00045" />
-      <option name="presentableId" value="LOCAL-00045" />
-      <option name="project" value="LOCAL" />
-      <updated>1634437932304</updated>
-    </task>
-    <task id="LOCAL-00046" summary="优化，增加部分注释">
-      <created>1646292963908</created>
-      <option name="number" value="00046" />
-      <option name="presentableId" value="LOCAL-00046" />
-      <option name="project" value="LOCAL" />
-      <updated>1646292963908</updated>
-    </task>
-    <task id="LOCAL-00047" summary="2.1.8">
-      <created>1646292978431</created>
-      <option name="number" value="00047" />
-      <option name="presentableId" value="LOCAL-00047" />
-      <option name="project" value="LOCAL" />
-      <updated>1646292978431</updated>
-    </task>
-    <task id="LOCAL-00048" summary="TerserPlugin">
-      <created>1646293408931</created>
-      <option name="number" value="00048" />
-      <option name="presentableId" value="LOCAL-00048" />
-      <option name="project" value="LOCAL" />
-      <updated>1646293408931</updated>
-    </task>
-    <task id="LOCAL-00049" summary="2.1.9">
-      <created>1646293508969</created>
-      <option name="number" value="00049" />
-      <option name="presentableId" value="LOCAL-00049" />
-      <option name="project" value="LOCAL" />
-      <updated>1646293508969</updated>
-    </task>
-    <task id="LOCAL-00050" summary="增加图像处理操作">
-      <created>1647827904359</created>
-      <option name="number" value="00050" />
-      <option name="presentableId" value="LOCAL-00050" />
-      <option name="project" value="LOCAL" />
-      <updated>1647827904359</updated>
-    </task>
-    <task id="LOCAL-00051" summary="2.1.10">
-      <created>1648457445389</created>
-      <option name="number" value="00051" />
-      <option name="presentableId" value="LOCAL-00051" />
-      <option name="project" value="LOCAL" />
-      <updated>1648457445389</updated>
-    </task>
-    <task id="LOCAL-00052" summary="2.1.11 截图优化">
-      <created>1649917728743</created>
-      <option name="number" value="00052" />
-      <option name="presentableId" value="LOCAL-00052" />
-      <option name="project" value="LOCAL" />
-      <updated>1649917728743</updated>
+      <workItem from="1660524325887" duration="6231000" />
+      <workItem from="1660544268877" duration="1196000" />
+      <workItem from="1660559304089" duration="596000" />
+      <workItem from="1660609864291" duration="1272000" />
+      <workItem from="1660618324918" duration="598000" />
+      <workItem from="1660644014789" duration="599000" />
+      <workItem from="1660695374925" duration="593000" />
+      <workItem from="1660702683815" duration="681000" />
+      <workItem from="1660887408534" duration="1827000" />
+      <workItem from="1660892708510" duration="599000" />
+      <workItem from="1661049918925" duration="597000" />
+      <workItem from="1661073417704" duration="594000" />
+      <workItem from="1661133652371" duration="599000" />
+      <workItem from="1661147230248" duration="648000" />
+      <workItem from="1661304066625" duration="1482000" />
+      <workItem from="1661307403631" duration="1194000" />
+      <workItem from="1663305397647" duration="8243000" />
+      <workItem from="1663546294976" duration="3345000" />
     </task>
     <task id="LOCAL-00053" summary="2.1.12 导出OpenSeadragon">
       <created>1649924762254</created>
@@ -668,7 +627,63 @@
       <option name="project" value="LOCAL" />
       <updated>1659956059809</updated>
     </task>
-    <option name="localTasksCounter" value="94" />
+    <task id="LOCAL-00094" summary="2.2.8">
+      <created>1660529152942</created>
+      <option name="number" value="00094" />
+      <option name="presentableId" value="LOCAL-00094" />
+      <option name="project" value="LOCAL" />
+      <updated>1660529152943</updated>
+    </task>
+    <task id="LOCAL-00095" summary="优化标注信息显示">
+      <created>1663307741209</created>
+      <option name="number" value="00095" />
+      <option name="presentableId" value="LOCAL-00095" />
+      <option name="project" value="LOCAL" />
+      <updated>1663307741209</updated>
+    </task>
+    <task id="LOCAL-00096" summary="标注事件回调">
+      <created>1663310530025</created>
+      <option name="number" value="00096" />
+      <option name="presentableId" value="LOCAL-00096" />
+      <option name="project" value="LOCAL" />
+      <updated>1663310530025</updated>
+    </task>
+    <task id="LOCAL-00097" summary="2.2.9">
+      <created>1663310718298</created>
+      <option name="number" value="00097" />
+      <option name="presentableId" value="LOCAL-00097" />
+      <option name="project" value="LOCAL" />
+      <updated>1663310718298</updated>
+    </task>
+    <task id="LOCAL-00098" summary="defaultShow">
+      <created>1663310824880</created>
+      <option name="number" value="00098" />
+      <option name="presentableId" value="LOCAL-00098" />
+      <option name="project" value="LOCAL" />
+      <updated>1663310824880</updated>
+    </task>
+    <task id="LOCAL-00099" summary="2.2.9">
+      <created>1663310831082</created>
+      <option name="number" value="00099" />
+      <option name="presentableId" value="LOCAL-00099" />
+      <option name="project" value="LOCAL" />
+      <updated>1663310831082</updated>
+    </task>
+    <task id="LOCAL-00100" summary="矩形框的选中点变成线">
+      <created>1663552353207</created>
+      <option name="number" value="00100" />
+      <option name="presentableId" value="LOCAL-00100" />
+      <option name="project" value="LOCAL" />
+      <updated>1663552353207</updated>
+    </task>
+    <task id="LOCAL-00101" summary="2.3.0">
+      <created>1663552368658</created>
+      <option name="number" value="00101" />
+      <option name="presentableId" value="LOCAL-00101" />
+      <option name="project" value="LOCAL" />
+      <updated>1663552368658</updated>
+    </task>
+    <option name="localTasksCounter" value="102" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -710,13 +725,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="标注时增加右键拖动视野" />
-    <MESSAGE value="曲线绘制中，按删除键，删除上一个标注点" />
-    <MESSAGE value="优化点击操作" />
-    <MESSAGE value="enableDbClickClose" />
-    <MESSAGE value="2.1.20" />
-    <MESSAGE value="view.js" />
     <MESSAGE value="优化选中点" />
     <MESSAGE value="优化标注图形显示，一次最多绘制5000个点，超过的标注延迟加载" />
     <MESSAGE value="键盘事件更新，delete可删除曲线标注点，双击可添加曲线标注点" />
@@ -735,7 +743,14 @@
     <MESSAGE value="触发限制优化" />
     <MESSAGE value="增加图片绘制" />
     <MESSAGE value="2.2.5" />
-    <option name="LAST_COMMIT_MESSAGE" value="2.2.5" />
+    <MESSAGE value="2.2.8" />
+    <MESSAGE value="优化标注信息显示" />
+    <MESSAGE value="标注事件回调" />
+    <MESSAGE value="defaultShow" />
+    <MESSAGE value="2.2.9" />
+    <MESSAGE value="矩形框的选中点变成线" />
+    <MESSAGE value="2.3.0" />
+    <option name="LAST_COMMIT_MESSAGE" value="2.3.0" />
     <option name="REFORMAT_BEFORE_PROJECT_COMMIT" value="true" />
   </component>
   <component name="XSLT-Support.FileAssociations.UIState">

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/06/22/3625ce6de8197c7315ce9e05b4ef233b/IHC.kfb';
+const fileName = '/upload/large_file/last/2022/09/07/fb6f566d15cc52331e3c4f3e1794a748/T2020-00935.kfb';
 
 const instance = axios.create({
   baseURL: '/api',
@@ -55,8 +55,8 @@ instance.get(`/slide/info?file=${fileName}`).then(({data}) => {
       imageCapRes: data.imageCapRes,
     },
     grid: {
-      show: true,
-      ruler: true,
+      show: false,
+      ruler: false,
     },
     openSeadragonOptions: {
       maxZoomLevel: data.scanScale * 10,
@@ -187,9 +187,22 @@ instance.get(`/slide/info?file=${fileName}`).then(({data}) => {
       );
     },
     measure: {
-      handler(content, label) {
+      selectHandler(content, label) {
         return [...content];
       },
+      handler(content, label) {
+        return ['标注类别：ASC-HS'];
+      },
+      show: true,
+    },
+    labelDrawing(canvas, label, region) {
+      /* console.log(label, region);
+       const ctx = canvas.getContext('2d');
+       ctx.beginPath();
+       ctx.lineWidth = 2;
+       ctx.moveTo(region.x, region.y);
+       ctx.lineTo(region.x-10, region.y);
+       ctx.stroke();*/
     },
     labelList: [
       {
@@ -204,7 +217,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 = [];
@@ -234,13 +247,9 @@ instance.get(`/slide/info?file=${fileName}`).then(({data}) => {
   rect.onclick = () => {
     kv.board.startDraw({
       tool: KfbView.marks.RECTANGLE,
-      lineWidth: 10,
       isROI: false,
       once: true,
       measure: true,
-      resize: false,
-      move: false,
-      fillStyle: '#ff00ff8d',
     });
   };
   line.onclick = () => {