kfb-view 2.1.20 → 2.2.2

package/.idea/workspace.xml

@@ -36,9 +36,7 @@
     </select>
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="55024232-8108-4dc9-9bd3-0fd2aa2f34f8" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/view.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/view.js" afterDir="false" />
-    </list>
+    <list default="true" id="55024232-8108-4dc9-9bd3-0fd2aa2f34f8" name="Default Changelist" comment="" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -73,21 +71,21 @@
     <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;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$/src/image" />
@@ -292,84 +290,14 @@
       <workItem from="1657274457584" duration="684000" />
       <workItem from="1657366256057" duration="578000" />
       <workItem from="1657519907711" duration="2848000" />
-      <workItem from="1657527397247" duration="10426000" />
-    </task>
-    <task id="LOCAL-00026" summary="2.0.15">
-      <created>1627457761721</created>
-      <option name="number" value="00026" />
-      <option name="presentableId" value="LOCAL-00026" />
-      <option name="project" value="LOCAL" />
-      <updated>1627457761721</updated>
-    </task>
-    <task id="LOCAL-00027" summary="优化代码结构">
-      <created>1630487596681</created>
-      <option name="number" value="00027" />
-      <option name="presentableId" value="LOCAL-00027" />
-      <option name="project" value="LOCAL" />
-      <updated>1630487596681</updated>
-    </task>
-    <task id="LOCAL-00028" summary="2.0.16">
-      <created>1630487867246</created>
-      <option name="number" value="00028" />
-      <option name="presentableId" value="LOCAL-00028" />
-      <option name="project" value="LOCAL" />
-      <updated>1630487867246</updated>
-    </task>
-    <task id="LOCAL-00029" summary="优化Curve标注，增加是否是闭合曲线参数">
-      <created>1631607168244</created>
-      <option name="number" value="00029" />
-      <option name="presentableId" value="LOCAL-00029" />
-      <option name="project" value="LOCAL" />
-      <updated>1631607168244</updated>
-    </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>
+      <workItem from="1657527397247" duration="15173000" />
+      <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="819000" />
     </task>
     <task id="LOCAL-00037" summary="Curve is obsolete. Please use polygon instead">
       <created>1631760521355</created>
@@ -637,7 +565,84 @@
       <option name="project" value="LOCAL" />
       <updated>1657539914133</updated>
     </task>
-    <option name="localTasksCounter" value="75" />
+    <task id="LOCAL-00075" summary="view.js">
+      <created>1657540107150</created>
+      <option name="number" value="00075" />
+      <option name="presentableId" value="LOCAL-00075" />
+      <option name="project" value="LOCAL" />
+      <updated>1657540107150</updated>
+    </task>
+    <task id="LOCAL-00076" summary="优化选中点">
+      <created>1657588323251</created>
+      <option name="number" value="00076" />
+      <option name="presentableId" value="LOCAL-00076" />
+      <option name="project" value="LOCAL" />
+      <updated>1657588323252</updated>
+    </task>
+    <task id="LOCAL-00077" summary="优化标注图形显示，一次最多绘制5000个点，超过的标注延迟加载">
+      <created>1657592781786</created>
+      <option name="number" value="00077" />
+      <option name="presentableId" value="LOCAL-00077" />
+      <option name="project" value="LOCAL" />
+      <updated>1657592781786</updated>
+    </task>
+    <task id="LOCAL-00078" summary="键盘事件更新，delete可删除曲线标注点，双击可添加曲线标注点">
+      <created>1657607397044</created>
+      <option name="number" value="00078" />
+      <option name="presentableId" value="LOCAL-00078" />
+      <option name="project" value="LOCAL" />
+      <updated>1657607397044</updated>
+    </task>
+    <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>
+    <option name="localTasksCounter" value="86" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -664,7 +669,7 @@
                   <entry key="branch">
                     <value>
                       <list>
-                        <option value="origin/master" />
+                        <option value="master" />
                       </list>
                     </value>
                   </entry>
@@ -679,17 +684,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.9" />
-    <MESSAGE value="增加图像处理操作" />
-    <MESSAGE value="2.1.10" />
-    <MESSAGE value="2.1.11 截图优化" />
-    <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="优化加载速度" />
@@ -704,7 +698,18 @@
     <MESSAGE value="优化点击操作" />
     <MESSAGE value="enableDbClickClose" />
     <MESSAGE value="2.1.20" />
-    <option name="LAST_COMMIT_MESSAGE" value="2.1.20" />
+    <MESSAGE value="view.js" />
+    <MESSAGE value="优化选中点" />
+    <MESSAGE value="优化标注图形显示，一次最多绘制5000个点，超过的标注延迟加载" />
+    <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="刻度线显示" />
+    <option name="LAST_COMMIT_MESSAGE" value="刻度线显示" />
     <option name="REFORMAT_BEFORE_PROJECT_COMMIT" value="true" />
   </component>
   <component name="XSLT-Support.FileAssociations.UIState">

package/example/index.js

@@ -40,16 +40,20 @@ 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,
+      scale: data.scanScale,
       vestigeZoom: .1,
     },
+    pxConversion: {
+      unit: 'um',
+      imageCapRes: data.imageCapRes,
+    },
     openSeadragonOptions: {
       maxZoomLevel: data.scanScale * 10,
       // imageLoaderLimit: 1,
@@ -182,6 +186,11 @@ instance.get(`/slide/info?file=${fileName}`).then(({data}) => {
   /* 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);
@@ -290,7 +299,7 @@ instance.get(`/slide/info?file=${fileName}`).then(({data}) => {
     // kv.board.endDraw();
   });
   kv.$on(KfbView.events.EVENT_DELETE_LABEL, (e) => {
-    console.log(e.detail);
+    console.log('EVENT_DELETE_LABEL', e.detail);
     // kv.board.endDraw();
   });
   kv.$on(KfbView.events.EVENT_SELECT_LABEL, (e) => {
@@ -320,22 +329,25 @@ instance.get(`/slide/info?file=${fileName}`).then(({data}) => {
   setTimeout(() => {
     // kv.destroy();
   }, 6000);
-  initLabels();
+
+  // initLabels();
 
   function initLabels() {
     const labels = [];
-    for (let i = 0; i < 10000; 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,
       };
       labels.push(label);
     }