kfb-view 2.4.1 → 3.0.0-beta2

package/.idea/workspace.xml

@@ -43,6 +43,10 @@
       <change beforePath="$PROJECT_DIR$/config/webpack.dev.conf.js" beforeDir="false" afterPath="$PROJECT_DIR$/config/webpack.dev.conf.js" afterDir="false" />
       <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/plugin/openseadragon/openseadragon.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/plugin/openseadragon/openseadragon.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/plugin/openseadragon/openseadragon.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/src/plugin/openseadragon/openseadragon.js.map" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/plugin/openseadragon/openseadragon.min.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/plugin/openseadragon/openseadragon.min.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/plugin/openseadragon/openseadragon.min.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/src/plugin/openseadragon/openseadragon.min.js.map" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -84,7 +88,7 @@
     "Project.color": "4c401d",
     "WebServerToolWindowFactoryState": "false",
     "dart.analysis.tool.window.visible": "false",
-    "last_opened_file_path": "/home/fanqifeng/WebstormProjects/kfb-view",
+    "last_opened_file_path": "/home/fanqifeng/WebstormProjects/kfb-view/src/plugin/openseadragon",
     "node.js.detected.package.eslint": "true",
     "node.js.detected.package.tslint": "true",
     "node.js.selected.package.eslint": "(autodetect)",
@@ -98,11 +102,11 @@
 }]]></component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
+      <recent name="$PROJECT_DIR$/src/plugin/openseadragon" />
       <recent name="$PROJECT_DIR$/example" />
       <recent name="$PROJECT_DIR$/src/image" />
       <recent name="$PROJECT_DIR$/src/plugin" />
       <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" />
@@ -176,8 +180,8 @@
     <recent_temporary>
       <list>
         <item itemvalue="npm.build:lib" />
-        <item itemvalue="npm.server:hot" />
         <item itemvalue="npm.server" />
+        <item itemvalue="npm.server:hot" />
         <item itemvalue="npm.clean:lib" />
         <item itemvalue="npm.build:prod" />
       </list>
@@ -389,14 +393,10 @@
       <workItem from="1671501857160" duration="90000" />
       <workItem from="1671751607914" duration="9693000" />
       <workItem from="1671762555964" duration="1197000" />
-      <workItem from="1675327241367" duration="367000" />
-    </task>
-    <task id="LOCAL-00070" summary="标注时增加右键拖动视野">
-      <created>1657537220254</created>
-      <option name="number" value="00070" />
-      <option name="presentableId" value="LOCAL-00070" />
-      <option name="project" value="LOCAL" />
-      <updated>1657537220255</updated>
+      <workItem from="1675327241367" duration="1458000" />
+      <workItem from="1675384282016" duration="594000" />
+      <workItem from="1675385204348" duration="1462000" />
+      <workItem from="1675843622628" duration="4524000" />
     </task>
     <task id="LOCAL-00071" summary="曲线绘制中，按删除键，删除上一个标注点">
       <created>1657538768786</created>
@@ -734,7 +734,14 @@
       <option name="project" value="LOCAL" />
       <updated>1675327595052</updated>
     </task>
-    <option name="localTasksCounter" value="119" />
+    <task id="LOCAL-00119" summary="2.4.1">
+      <created>1675327616880</created>
+      <option name="number" value="00119" />
+      <option name="presentableId" value="LOCAL-00119" />
+      <option name="project" value="LOCAL" />
+      <updated>1675327616880</updated>
+    </task>
+    <option name="localTasksCounter" value="120" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -747,6 +754,7 @@
         <option value="Default.Author" />
         <option value="Default.Date" />
         <option value="Default.Subject" />
+        <option value="Space.CommitStatus" />
       </list>
     </option>
   </component>
@@ -776,7 +784,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.2.5" />
     <MESSAGE value="2.2.8" />
     <MESSAGE value="优化标注信息显示" />
     <MESSAGE value="标注事件回调" />
@@ -801,7 +808,8 @@
     <MESSAGE value="2.4.0,绘制标注优化，一次只绘制2000个，分批绘制" />
     <MESSAGE value="截图区域范围数值保留2位小数" />
     <MESSAGE value="标注位置跳转增加参数，是否显示跳转动画" />
-    <option name="LAST_COMMIT_MESSAGE" value="标注位置跳转增加参数，是否显示跳转动画" />
+    <MESSAGE value="2.4.1" />
+    <option name="LAST_COMMIT_MESSAGE" value="2.4.1" />
     <option name="REFORMAT_BEFORE_PROJECT_COMMIT" value="true" />
   </component>
   <component name="XSLT-Support.FileAssociations.UIState">

package/config/webpack.dev.conf.js

@@ -3,7 +3,7 @@ const webpackMerge = require('webpack-merge');
 const baseWebpackConfig = require('./webpack.base.conf');
 const METADATA = webpackMerge(baseWebpackConfig().metadata, {
   host: '0.0.0.0',
-  port: 3001,
+  port: 3101,
 });
 
 process.env.NODE_ENV = process.env.NODE_ENV ?

package/example/index.js

@@ -136,7 +136,7 @@ instance.get(`/process/info?file=${fileName}`).then(({data}) => {
       if (rangeB === 0 && rangeA === 1 && rangeS === 0 && rangeL === 0 &&
         rangeR === 0 && rangeG === 0) {
         context.drawImage(
-          rendered.canvas,
+          initRendered.canvas,
           0,
           0,
           sourceWidth,
@@ -148,7 +148,8 @@ instance.get(`/process/info?file=${fileName}`).then(({data}) => {
         );
         return;
       }
-      if (!cacheImage[tile.url]) {
+      const url = tile.getUrl();
+      if (!cacheImage[url]) {
         const sourceLength = sourceWidth * sourceHeight;
         const canvas = rendered.canvas;
         let imageData = initRendered.getImageData(0, 0, canvas.width,
@@ -196,10 +197,10 @@ instance.get(`/process/info?file=${fileName}`).then(({data}) => {
           imageData.data[i * 4 + 2] = b;
         }
         rendered.putImageData(imageData, 0, 0);
-        cacheImage[tile.url] = canvas;
+        cacheImage[url] = canvas;
       }
       context.drawImage(
-        cacheImage[tile.url],
+        cacheImage[url],
         0,
         0,
         sourceWidth,
@@ -412,7 +413,7 @@ instance.get(`/process/info?file=${fileName}`).then(({data}) => {
     }, 6000);
   }, 6000);
 
-  initLabels();
+  // initLabels();
 
   function initLabels() {
     const labels = [];
@@ -441,6 +442,16 @@ instance.get(`/process/info?file=${fileName}`).then(({data}) => {
     kv.initLabelList(labels);
   }
 
+  document.querySelector('#reDraw').addEventListener('click', () => {
+    document.querySelector('#a').value = 1;
+    document.querySelector('#s').value = 0;
+    document.querySelector('#l').value = 0;
+    document.querySelector('#r').value = 0;
+    document.querySelector('#g').value = 0;
+    document.querySelector('#b').value = 0;
+    kv.viewer.forceRedraw();
+  });
+
   /*
     instance.get(
       `/image_annotation?file=${fileName}&slide_label_id=38749&user_id=27`).