kfb-view 2.3.9 → 2.4.1

package/.idea/workspace.xml

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="AutoImportSettings">
+    <option name="autoReloadType" value="SELECTIVE" />
+  </component>
   <component name="BranchesTreeState">
     <expand>
       <path>
@@ -36,11 +39,10 @@
     </select>
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="55024232-8108-4dc9-9bd3-0fd2aa2f34f8" name="Default Changelist" comment="2.3.5,截图文字内容可自定义">
+    <list default="true" id="55024232-8108-4dc9-9bd3-0fd2aa2f34f8" name="Default Changelist" comment="截图区域范围数值保留2位小数">
       <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/components/shape/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/shape/index.js" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -76,22 +78,24 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <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 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",
+    "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>
+}]]></component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
       <recent name="$PROJECT_DIR$/example" />
@@ -380,28 +384,12 @@
       <workItem from="1669545429121" duration="449000" />
       <workItem from="1669940971680" duration="1305000" />
       <workItem from="1669965653573" duration="2149000" />
-      <workItem from="1671419756098" duration="338000" />
-    </task>
-    <task id="LOCAL-00067" summary="2.1.19">
-      <created>1657181784906</created>
-      <option name="number" value="00067" />
-      <option name="presentableId" value="LOCAL-00067" />
-      <option name="project" value="LOCAL" />
-      <updated>1657181784906</updated>
-    </task>
-    <task id="LOCAL-00068" summary="绘制起点提示">
-      <created>1657182306689</created>
-      <option name="number" value="00068" />
-      <option name="presentableId" value="LOCAL-00068" />
-      <option name="project" value="LOCAL" />
-      <updated>1657182306689</updated>
-    </task>
-    <task id="LOCAL-00069" summary="曲线双击结束绘制">
-      <created>1657532017463</created>
-      <option name="number" value="00069" />
-      <option name="presentableId" value="LOCAL-00069" />
-      <option name="project" value="LOCAL" />
-      <updated>1657532017464</updated>
+      <workItem from="1671419756098" duration="2398000" />
+      <workItem from="1671437015276" duration="591000" />
+      <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>
@@ -725,7 +713,28 @@
       <option name="project" value="LOCAL" />
       <updated>1669966382574</updated>
     </task>
-    <option name="localTasksCounter" value="116" />
+    <task id="LOCAL-00116" summary="2.4.0,绘制标注优化，一次只绘制2000个，分批绘制">
+      <created>1671761704584</created>
+      <option name="number" value="00116" />
+      <option name="presentableId" value="LOCAL-00116" />
+      <option name="project" value="LOCAL" />
+      <updated>1671761704585</updated>
+    </task>
+    <task id="LOCAL-00117" summary="截图区域范围数值保留2位小数">
+      <created>1675327515756</created>
+      <option name="number" value="00117" />
+      <option name="presentableId" value="LOCAL-00117" />
+      <option name="project" value="LOCAL" />
+      <updated>1675327515756</updated>
+    </task>
+    <task id="LOCAL-00118" summary="标注位置跳转增加参数，是否显示跳转动画">
+      <created>1675327595052</created>
+      <option name="number" value="00118" />
+      <option name="presentableId" value="LOCAL-00118" />
+      <option name="project" value="LOCAL" />
+      <updated>1675327595052</updated>
+    </task>
+    <option name="localTasksCounter" value="119" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -767,9 +776,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="grid优化" />
-    <MESSAGE value="触发限制优化" />
-    <MESSAGE value="增加图片绘制" />
     <MESSAGE value="2.2.5" />
     <MESSAGE value="2.2.8" />
     <MESSAGE value="优化标注信息显示" />
@@ -792,7 +798,10 @@
     <MESSAGE value="2.3.6,优化移动标注时的判断操作" />
     <MESSAGE value="2.3.6,截图文字内容判断异常" />
     <MESSAGE value="2.3.8,截图文字内容增加函数" />
-    <option name="LAST_COMMIT_MESSAGE" value="2.3.8,截图文字内容增加函数" />
+    <MESSAGE value="2.4.0,绘制标注优化，一次只绘制2000个，分批绘制" />
+    <MESSAGE value="截图区域范围数值保留2位小数" />
+    <MESSAGE value="标注位置跳转增加参数，是否显示跳转动画" />
+    <option name="LAST_COMMIT_MESSAGE" value="标注位置跳转增加参数，是否显示跳转动画" />
     <option name="REFORMAT_BEFORE_PROJECT_COMMIT" value="true" />
   </component>
   <component name="XSLT-Support.FileAssociations.UIState">

package/config/webpack.dev.conf.js

@@ -66,7 +66,8 @@ 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.22',
+          // target: 'http://192.168.1.22',
+          target: 'https://vai.hzztai.com',
           // target: 'https://tct.hzztai.com',
           //  target: 'https://pis-ningbo.hzztai.com',
           // target: 'https://pis-test.hzztai.com',

package/example/index.js

@@ -76,7 +76,7 @@ instance.get(`/process/info?file=${fileName}`).then(({data}) => {
     },
     pxConversion: {
       unit: 'um',
-      imageCapRes: data.imageCapRes,
+      imageCapRes: data.imageCapRes || 1,
     },
     grid: {
       show: false,
@@ -273,7 +273,7 @@ instance.get(`/process/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 = [];
@@ -412,67 +412,36 @@ instance.get(`/process/info?file=${fileName}`).then(({data}) => {
     }, 6000);
   }, 6000);
 
-  // initLabels();
+  initLabels();
 
   function initLabels() {
     const labels = [];
-    const colors = ['#027AFF', '#f56c6c'];
-    for (let i = 0; i < 50000; i++) {
+    const colors = ['#027AFF', '#f56c6c', '#11ff6c', '#f56cff', '#11ffff'];
+    for (let i = 0; i < 10000; i++) {
       const point = {
         x: Math.random() * data.width,
         y: Math.random() * data.height,
       };
+      const point1 = {
+        x: point.x + Math.random() * 1000,
+        y: point.y + Math.random() * 1000,
+      };
       const label = {
         // fillStyle: 'rgba(2, 122, 255, 1)',
-        lineWidth: 6,
-        points: [point, point],
+        lineWidth: 2,
+        points: [point, point1],
         scale: 0.1,
-        strokeStyle: Math.random() > .5 ? colors[0] : colors[1],
-        tool: 'Dot',
-        move: false,
+        strokeStyle: colors[(Math.random() * colors.length) >> 0],
+        tool: 'Rectangle',
+        move: true,
+        resize: true,
       };
       labels.push(label);
     }
     kv.initLabelList(labels);
   }
 
-  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');
-    });
-  document.querySelector('#reDraw').addEventListener('click', () => {
+  /*
     instance.get(
       `/image_annotation?file=${fileName}&slide_label_id=38749&user_id=27`).
       then(({data}) => {
@@ -500,8 +469,7 @@ instance.get(`/process/info?file=${fileName}`).then(({data}) => {
               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);
+            r.content = (kv.area.getMeasureContent(r)?.texts || []).slice(1, -1);
             labelRegionList.push({
               ...r,
             });
@@ -510,7 +478,45 @@ instance.get(`/process/info?file=${fileName}`).then(({data}) => {
         kv.initLabelList(labelRegionList.filter(({deleted_at}) => !deleted_at));
         console.timeEnd('initLabelList');
       });
-  });
+    document.querySelector('#reDraw').addEventListener('click', () => {
+      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');
+        });
+    });*/
 });
 
 /**