npm - kfb-view - Versions diffs - 2.3.3 → 2.3.5 - Mend

kfb-view 2.3.3 → 2.3.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (8) hide show

package/.idea/workspace.xml +71 -59
package/config/webpack.dev.conf.js +1 -1
package/example/index.js +46 -9
package/lib/kfb-view.js +1 -1
package/package.json +1 -1
package/src/components/area/index.js +0 -1
package/src/components/tailoring/index.js +10 -4
package/src/view.js +4 -0

package/.idea/workspace.xml CHANGED Viewed

@@ -37,17 +37,10 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="55024232-8108-4dc9-9bd3-0fd2aa2f34f8" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/example/label/check.svg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/example/label/check_empty.svg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/example/label/cross.svg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/example/label/cross_empty.svg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/example/label/delete.svg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/example/label/delete_empty.svg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/example/label/hasAudit.svg" afterDir="false" />
       <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$/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" />
+      <change beforePath="$PROJECT_DIR$/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/package.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/components/tailoring/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/tailoring/index.js" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -83,22 +76,22 @@
     <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/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 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" />
@@ -365,35 +358,26 @@
       <workItem from="1664237971278" duration="500000" />
       <workItem from="1664521013893" duration="3516000" />
       <workItem from="1664527271315" duration="101000" />
-      <workItem from="1666923133420" duration="7283000" />
-    </task>
-    <task id="LOCAL-00059" summary="2.1.15">
-      <created>1650965886754</created>
-      <option name="number" value="00059" />
-      <option name="presentableId" value="LOCAL-00059" />
-      <option name="project" value="LOCAL" />
-      <updated>1650965886754</updated>
-    </task>
-    <task id="LOCAL-00060" summary="闭合曲线">
-      <created>1650966647247</created>
-      <option name="number" value="00060" />
-      <option name="presentableId" value="LOCAL-00060" />
-      <option name="project" value="LOCAL" />
-      <updated>1650966647247</updated>
-    </task>
-    <task id="LOCAL-00061" summary="2.1.16">
-      <created>1650967323558</created>
-      <option name="number" value="00061" />
-      <option name="presentableId" value="LOCAL-00061" />
-      <option name="project" value="LOCAL" />
-      <updated>1650967323558</updated>
-    </task>
-    <task id="LOCAL-00062" summary="优化加载速度">
-      <created>1651037514502</created>
-      <option name="number" value="00062" />
-      <option name="presentableId" value="LOCAL-00062" />
-      <option name="project" value="LOCAL" />
-      <updated>1651037514503</updated>
+      <workItem from="1666923133420" duration="7628000" />
+      <workItem from="1666938040394" duration="124000" />
+      <workItem from="1666938888266" duration="914000" />
+      <workItem from="1666940059058" duration="598000" />
+      <workItem from="1667175003009" duration="594000" />
+      <workItem from="1667184664626" duration="1313000" />
+      <workItem from="1667201967516" duration="2489000" />
+      <workItem from="1667268688798" duration="1219000" />
+      <workItem from="1667284578069" duration="184000" />
+      <workItem from="1667375142206" duration="2786000" />
+      <workItem from="1667378801635" duration="594000" />
+      <workItem from="1667393411315" duration="590000" />
+      <workItem from="1667434716150" duration="280000" />
+      <workItem from="1667617108891" duration="2574000" />
+      <workItem from="1667627800845" duration="112000" />
+      <workItem from="1667787899066" duration="98000" />
+      <workItem from="1668850189781" duration="655000" />
+      <workItem from="1668991614733" duration="532000" />
+      <workItem from="1668992196461" duration="1190000" />
+      <workItem from="1669545429121" duration="316000" />
     </task>
     <task id="LOCAL-00063" summary="2.1.17">
       <created>1651037523261</created>
@@ -710,7 +694,35 @@
       <option name="project" value="LOCAL" />
       <updated>1666926343036</updated>
     </task>
-    <option name="localTasksCounter" value="108" />
+    <task id="LOCAL-00108" summary="优化速度">
+      <created>1666937547422</created>
+      <option name="number" value="00108" />
+      <option name="presentableId" value="LOCAL-00108" />
+      <option name="project" value="LOCAL" />
+      <updated>1666937547423</updated>
+    </task>
+    <task id="LOCAL-00109" summary="2.3.3">
+      <created>1666937564499</created>
+      <option name="number" value="00109" />
+      <option name="presentableId" value="LOCAL-00109" />
+      <option name="project" value="LOCAL" />
+      <updated>1666937564500</updated>
+    </task>
+    <task id="LOCAL-00110" summary="解决标注时鼠标右键和左键同时点击时，移动异常">
+      <created>1667617934430</created>
+      <option name="number" value="00110" />
+      <option name="presentableId" value="LOCAL-00110" />
+      <option name="project" value="LOCAL" />
+      <updated>1667617934430</updated>
+    </task>
+    <task id="LOCAL-00111" summary="2.3.4">
+      <created>1667618110588</created>
+      <option name="number" value="00111" />
+      <option name="presentableId" value="LOCAL-00111" />
+      <option name="project" value="LOCAL" />
+      <updated>1667618110588</updated>
+    </task>
+    <option name="localTasksCounter" value="112" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -752,10 +764,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.1" />
-    <MESSAGE value="index.js" />
-    <MESSAGE value="导航轨迹显示" />
-    <MESSAGE value="刻度线显示" />
     <MESSAGE value="2.2.2" />
     <MESSAGE value="增加网格线和标尺" />
     <MESSAGE value="标注信息优化显示" />
@@ -777,7 +785,11 @@
     <MESSAGE value="2.3.1" />
     <MESSAGE value="优化渲染速度" />
     <MESSAGE value="2.3.2" />
-    <option name="LAST_COMMIT_MESSAGE" value="2.3.2" />
+    <MESSAGE value="优化速度" />
+    <MESSAGE value="2.3.3" />
+    <MESSAGE value="解决标注时鼠标右键和左键同时点击时，移动异常" />
+    <MESSAGE value="2.3.4" />
+    <option name="LAST_COMMIT_MESSAGE" value="2.3.4" />
     <option name="REFORMAT_BEFORE_PROJECT_COMMIT" value="true" />
   </component>
   <component name="XSLT-Support.FileAssociations.UIState">

package/config/webpack.dev.conf.js CHANGED Viewed

@@ -66,7 +66,7 @@ module.exports = function() {
           // target: 'http://gastric.label.hzztai.com/',
           // target: 'http://192.168.1.91:7007',
           // target: 'http://192.168.1.91',
-          target: 'http://192.168.1.16',
+          target: 'http://192.168.1.22',
           // target: 'https://tct.hzztai.com',
           //  target: 'https://pis-ningbo.hzztai.com',
           // target: 'https://pis-test.hzztai.com',

package/example/index.js CHANGED Viewed

@@ -25,12 +25,12 @@ deleteEmptyImg.src = deleteEmptySvg;
 const hasAuditImg = new Image();
 hasAuditImg.src = hasAuditSvg;
-const fileName = '/uploads/TCT/已入库/ningbo_pathology_center/neg/labeling/WS/T2018-46374_ThinPrep_2018-08-31_WS.kfb';
+const fileName = 'uploads/TCT/已入库/guangzhou_fuer_hospital/pos/labeling/LSIL/MY22004_other_2022-08-22_LSIL_切片2.kfb';
 const instance = axios.create({
   baseURL: '/api',
   timeout: 1000,
-  headers: {'Authorization': 'bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOi8vMTkyLjE2OC4xLjE2L2FwaS9hdXRoL2xvZ2luIiwiaWF0IjoxNjY2OTI2ODk1LCJleHAiOjE2NjY5NjUyOTUsIm5iZiI6MTY2NjkyNjg5NSwianRpIjoieU5mT3NXMmVraWs0RTUxayIsInN1YiI6MSwicHJ2IjoiMjNiZDVjODk0OWY2MDBhZGIzOWU3MDFjNDAwODcyZGI3YTU5NzZmNyJ9.2T7Xkx-5BhtR1HOc5FLbJIzDmgaq2bbCuXJoowUX0IE'},
+  headers: {'Authorization': 'bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOi8vMTkyLjE2OC4xLjIyL2FwaS9hdXRoL2xvZ2luIiwiaWF0IjoxNjY3NjE2OTIyLCJleHAiOjE2Njc2NTUzMjIsIm5iZiI6MTY2NzYxNjkyMiwianRpIjoiMDl4SEZMdlpHUlliVExlQyIsInN1YiI6MjcsInBydiI6IjIzYmQ1Yzg5NDlmNjAwYWRiMzllNzAxYzQwMDg3MmRiN2E1OTc2ZjcifQ.buNwEIsNSqo1-wH8zEaRyjauIVKOXmjJfjaa1-g9l_k'},
 });
 let cacheImage = {};
@@ -304,7 +304,6 @@ instance.get(`/process/info?file=${fileName}`).then(({data}) => {
     kv.board.startDraw({
       tool: KfbView.marks.RECTANGLE,
       isROI: false,
-      once: true,
       measure: true,
     });
   };
@@ -373,9 +372,9 @@ instance.get(`/process/info?file=${fileName}`).then(({data}) => {
       console.log(e);
     });*/
   kv.$on(KfbView.events.EVENT_END_PAINTING, (e) => {
-    console.log(e.detail);
-    list.push(e.detail);
-    kv.initLabelList(list);
+    console.time('appendLabelList');
+    kv.appendLabelList([e.detail]);
+    console.timeEnd('appendLabelList');
     // kv.board.endDraw();
   });
   kv.$on(KfbView.events.EVENT_DELETE_LABEL, (e) => {
@@ -438,7 +437,7 @@ instance.get(`/process/info?file=${fileName}`).then(({data}) => {
   }
   instance.get(
-    `/image_annotation?file=${fileName}&slide_label_id=48010&user_id=1`).
+    `/image_annotation?file=${fileName}&slide_label_id=38749&user_id=27`).
     then(({data}) => {
       data = data.data;
       const labelRegionList = [];
@@ -451,7 +450,7 @@ instance.get(`/process/info?file=${fileName}`).then(({data}) => {
             tool: (item.type || item.tool) === 'Spline' ?
               'Polygon' :
               (item.type || item.tool),
-            strokeStyle: `#${item.color.toString(16).
+            strokeStyle: item.strokeStyle || `#${item.color.toString(16).
               slice(2)}${item.color.toString(16).slice(0, 2)}`,
             measure: true,
             sub_class: subClass,
@@ -469,10 +468,48 @@ instance.get(`/process/info?file=${fileName}`).then(({data}) => {
             ...r,
           });
         });
+      console.time('initLabelList');
       kv.initLabelList(labelRegionList.filter(({deleted_at}) => !deleted_at));
+      console.timeEnd('initLabelList');
     });
   document.querySelector('#reDraw').addEventListener('click', () => {
-    initLabels();
+    instance.get(
+      `/image_annotation?file=${fileName}&slide_label_id=38749&user_id=27`).
+      then(({data}) => {
+        data = data.data;
+        const labelRegionList = [];
+        (data || []).filter(item => item.id && item.region.width > 0).
+          forEach(item => {
+            const subClass = item.sub_class || item.subClass;
+            const is_ai = !!item.score || subClass === 'ROI' && !item.user_name; // 通过分数来判断是否是AI识别标注
+            const r = {
+              ...item,
+              tool: (item.type || item.tool) === 'Spline' ?
+                'Polygon' :
+                (item.type || item.tool),
+              strokeStyle: item.strokeStyle || `#${item.color.toString(16).
+                slice(2)}${item.color.toString(16).slice(0, 2)}`,
+              measure: true,
+              sub_class: subClass,
+              isROI: subClass === 'ROI',
+              isClose: item.isClose || item.is_close,
+              lineWidth: item.lineWidth || item.width,
+              text: item.text || item.description,
+              is_ai,
+              ai_sub_class: is_ai ? (item.ai_sub_class ?? item.sub_class) : '',
+              ai_points: is_ai ? (item.ai_points ?? item.points) : '',
+              ai_region: is_ai ? (item.ai_region ?? item.region) : '',
+            };
+            r.content = (kv.area.getMeasureContent(r)?.texts || []).slice(1,
+              -1);
+            labelRegionList.push({
+              ...r,
+            });
+          });
+        console.time('initLabelList');
+        kv.initLabelList(labelRegionList.filter(({deleted_at}) => !deleted_at));
+        console.timeEnd('initLabelList');
+      });
   });
 });