kfb-view 3.0.0-beta1 → 3.0.0-beta3

package/.idea/workspace.xml

@@ -82,24 +82,24 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "DefaultHtmlFileTemplate": "HTML File",
-    "Project.color": "4c401d",
-    "WebServerToolWindowFactoryState": "false",
-    "dart.analysis.tool.window.visible": "false",
-    "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)",
-    "node.js.selected.package.tslint": "(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/src/plugin/openseadragon&quot;,
+    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
+    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
+    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
+    &quot;node.js.selected.package.tslint&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/javascript-impl/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/plugin/openseadragon" />
@@ -180,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>
@@ -396,7 +396,9 @@
       <workItem from="1675327241367" duration="1458000" />
       <workItem from="1675384282016" duration="594000" />
       <workItem from="1675385204348" duration="1462000" />
-      <workItem from="1675843622628" duration="981000" />
+      <workItem from="1675843622628" duration="4524000" />
+      <workItem from="1675848342418" duration="2364000" />
+      <workItem from="1675902452322" duration="324000" />
     </task>
     <task id="LOCAL-00071" summary="曲线绘制中，按删除键，删除上一个标注点">
       <created>1657538768786</created>

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`).