kfb-view 3.0.7 → 3.0.9

package/src/util/calculate.js

@@ -51,8 +51,20 @@ function getRectPoint(startPoint, endPoint, deg = 0) {
     }];
 }
 
+/*
+* 叉乘计算公式 a×b ＝（x1y2－x2y1）
+* @param {Object} p1
+* @param {Object} p2
+* @return {number}
+*/
+function crossProduct(p1, p2) {
+  return p1.x * p2.y - p2.x * p1.y;
+}
+
+
 /**
- * 判断一个点是否在某条线段的一边上，就可以利用叉乘的方向性，p1p2 * p1p
+ * 判断一个点是否在某条线段的一边上，就可以利用叉乘的方向性，AB X AC
+ * (B.x - A.x) * (C.y - A.y) - (C.x - A.x) * (B.y - A.y);
  * @param {Object} p1
  * @param {Object} p2
  * @param {Object} p
@@ -69,6 +81,9 @@ function getCross(p1, p2, p) {
  * @param {Object} p3
  * @param {Object} p4
  * @param {Object} p
+ * p1————p2
+ * |      |
+ * p3————p4
  * @return {boolean}
  */
 function isPointInMatrix(p1, p2, p3, p4, p) {
@@ -78,6 +93,7 @@ function isPointInMatrix(p1, p2, p3, p4, p) {
 
 /**
  * 判断p是否在椭圆中
+ * x² / a² + y² / b² = 1 椭圆计算公式， <1点在椭圆内
  * @param {Object} point 点
  * @param {Object} center 椭圆中心
  * @param {Number} a 长轴
@@ -107,7 +123,6 @@ function pointInOtherPoint(point, currentPoint, width = 10) {
 /**
  * 判断一个点是否在闭合的曲线内
  * 从目标点引一条射线，判断这条线与曲线的交点个数为奇数还是偶数，为奇数表示点在曲线内，偶数表示点在曲线外。
- * 向Y轴正方向引射线，判断射线与曲线的交点个数。
  * @param {Object}  p
  * @param {Object[]} poly
  * @return {boolean}
@@ -115,37 +130,67 @@ function pointInOtherPoint(point, currentPoint, width = 10) {
 function isPointInPolygon(p, poly) {
   const px = p.x;
   const py = p.y;
-  let flag = false;
+  let count = 0;
 
   for (let i = 0, l = poly.length, j = l - 1; i < l; j = i, i++) {
-    const sx = poly[i].x;
-    const sy = poly[i].y;
-    const tx = poly[j].x;
-    const ty = poly[j].y;
-
-    // 点与多边形顶点重合
-    if ((sx === px && sy === py) || (tx === px && ty === py)) {
-      return true;
-    }
-
-    // 判断线段两端点是否在射线两侧
-    if ((sy < py && ty >= py) || (sy >= py && ty < py)) {
-      // 线段上与射线 Y 坐标相同的点的 X 坐标
-      const x = sx + (py - sy) * (tx - sx) / (ty - sy);
-      // 点在多边形的边上,8像素的偏差
-      if (Math.abs(x - px) < 10) {
-        return true;
-      }
+    const x0 = poly[j].x;
+    const y0 = poly[j].y;
+    const x1 = poly[i].x;
+    const y1 = poly[i].y;
+    const minY = Math.min(y0, y1);
+    const maxY = Math.max(y0, y1);
+    const minX = Math.min(x0, x1);
+    const maxX = Math.max(x0, x1);
 
-      // 射线穿过多边形的边界
-      if (x > px) {
-        flag = !flag;
+    if (py > maxY) {
+      // 无交点，与最小外接矩形不相交
+    } else if (py < minY) {
+      // 无交点，与最小外接矩形不相交
+    } else { //  minY <= py && py <= maxY
+      if (px > maxX) {
+        // 无交点，与最小外接矩形不相交
+      } else if (px < minX) { // 有交点，但需要判断是否与最小外接矩形边界重合
+        if (minY === py && py < maxY) {
+          count++; // 交点计数，与最小外接矩形下边界重合
+        } else if (minY < py && py === maxY) {
+          // 交点不计，与最小外接矩形上边界重合
+        } else if (minY === py && py === maxY) {
+          // 交点不计，与最小外接矩形上下边界重合
+        } else {
+          count++; // 交点计数，不与最小外界矩形边界重合
+        }
+      } else { // minX <= px && px <= maxX
+        const p1 = {
+          x: x0 - px,
+          y: y0 - py,
+        };
+        const p2 = {
+          x: x1 - x0,
+          y: y1 - y0,
+        };
+        const p3 = {
+          x: x1 - x0 - 100000,
+          y: y1 - y0,
+        };
+        // (P1Q1 X Q2Q1) *(P2Q1 X Q2Q1)
+        if (crossProduct(p1, p2) * crossProduct(p3, p2) > 0) {
+          // 跨立判断不成立
+        } else { // 有交点，但需要判断是否与最小外接矩形边界重合
+          if (minY === py && py < maxY) {
+            count++; // 交点计数，与最小外接矩形下边界重合
+          } else if (minY < py && py === maxY) {
+            // 交点不计，与最小外接矩形上边界重合
+          } else if (minY === py && py === maxY) {
+            // 交点不计，与最小外接矩形上下边界重合
+          } else {
+            count++; // 交点计数，不与最小外界矩形边界重合
+          }
+        }
       }
     }
   }
 
-  // 射线穿过多边形边界的次数为奇数时点在多边形内
-  return flag;
+  return count % 2 === 1;
 }
 
 /**
@@ -155,15 +200,14 @@ function isPointInPolygon(p, poly) {
  * @return {boolean}
  */
 function isPointInLine(p, points) {
-  const startPoint = points[0];
-  const endPoint = points[1];
-  // 判断线段两端点是否在射线两侧
-  if ((startPoint.y < p.y && endPoint.y >= p.y) ||
-    (startPoint.y >= p.y && endPoint.y < p.y)) {
-    // 线段上与射线 Y 坐标相同的点的 X 坐标
-    const x = startPoint.x + (p.y - startPoint.y) *
-      (endPoint.x - startPoint.x) / (endPoint.y - startPoint.y);
-    // 点在多边形的边上,8像素的偏差
+  const s1 = points[0];
+  const s2 = points[1];
+  if ((s1.y < p.y && s2.y >= p.y) ||
+    (s1.y >= p.y && s2.y < p.y)) {
+    // 叉乘计算
+    const x = s1.x + (p.y - s1.y) *
+      (s2.x - s1.x) / (s2.y - s1.y);
+    // 8像素的偏差
     if (Math.abs(x - p.x) < 8) {
       return true;
     }

package/src/util/imageData.js

@@ -96,8 +96,3 @@ export {
   cacheGammaTable,
 };
 
-export const imageSharpenUM = (r, g, b) => {
-
-};
-
-

package/src/view.js

@@ -1,7 +1,7 @@
 import openSeadragon from './plugin/openseadragon/openseadragon';
 import './util/canvas';
 import {EventEmitter} from './util/event-emitter';
-import {$, dataType, deepClone, delayedTrigger} from './util';
+import {$, dataType, deepClone} from './util';
 import {pointsToRegion} from './util/calculate';
 import * as COMPONENTS from './const/component';
 import * as EVENTS from './const/event';
@@ -68,6 +68,7 @@ export default class KfbView extends EventEmitter {
    * @param {boolean=} config.grid.disabled 是否禁用网格线
    * @param {boolean=} config.grid.show 是否显示网格线
    * @param {boolean=} config.grid.ruler 是否启用标尺
+   * @param {boolean=} config.grid.pxConversion 是否启用标尺
    * @param {function=} config.measure.handler 标注信息的回调处理
    * @param {function=} config.measure.selectHandler 标注信息选中时的回调处理
    * @param {boolean=} config.measure.color 标注注释颜色
@@ -350,8 +351,8 @@ function initEvent(kv) {
       kv.area.onCanvasRelease(e.position);
     }
   });
-  // 键盘事件会连续触发两次
-  kv.viewer.addHandler('canvas-key', delayedTrigger((e) => {
+
+  kv.viewer.addHandler('canvas-key', (e) => {
     const {originalEvent} = e;
     e.preventDefaultAction = originalEvent.key.indexOf('Arrow') === -1;
     handlerCacheEvent(originalEvent, kv);
@@ -366,7 +367,7 @@ function initEvent(kv) {
       kv.area?.change?.(e);
       kv.shape?.change?.(e);
     }
-  }, 100));
+  });
 
   kv.viewer.addHandler('canvas-double-click', (e) => {
     if (kv.board?.isInDraw) {
@@ -392,9 +393,9 @@ function initEvent(kv) {
   let isRightDown = false;
   let dragPosition;
 
-  kv.viewer.canvas.addEventListener('contextmenu', function(event) {
+  kv.viewer.addHandler('canvas-contextmenu', function(e) {
     if (kv.board?.isInDraw) {
-      event.preventDefault();
+      e.preventDefault = true;
     }
   });
 

package/.idea/codeStyles/codeStyleConfig.xml

@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </state>
-</component>

package/.idea/git_toolbox_prj.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GitToolBoxProjectSettings">
-    <option name="commitMessageIssueKeyValidationOverride">
-      <BoolValueOverride>
-        <option name="enabled" value="true" />
-      </BoolValueOverride>
-    </option>
-    <option name="commitMessageValidationConfigOverride">
-      <CommitMessageValidationOverride>
-        <option name="enabled" value="true" />
-      </CommitMessageValidationOverride>
-    </option>
-    <option name="commitMessageValidationEnabledOverride">
-      <BoolValueOverride>
-        <option name="enabled" value="true" />
-      </BoolValueOverride>
-    </option>
-  </component>
-</project>

package/.idea/inspectionProfiles/Project_Default.xml

@@ -1,6 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
-  </profile>
-</component>

package/.idea/inspectionProfiles/profiles_settings.xml

@@ -1,5 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <settings>
-    <option name="PROJECT_PROFILE" />
-  </settings>
-</component>

package/.idea/kfb-view.iml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
-      <excludeFolder url="file://$MODULE_DIR$/temp" />
-      <excludeFolder url="file://$MODULE_DIR$/tmp" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

package/.idea/misc.xml

@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="MarkdownProjectSettings" wasCopied="true">
-    <PreviewSettings splitEditorLayout="SPLIT" splitEditorPreview="PREVIEW" useGrayscaleRendering="false" zoomFactor="1.0" maxImageWidth="0" showGitHubPageIfSynced="false" allowBrowsingInPreview="false" synchronizePreviewPosition="true" highlightPreviewType="NONE" highlightFadeOut="5" highlightOnTyping="true" synchronizeSourcePosition="true" verticallyAlignSourceAndPreviewSyncPosition="true" showSearchHighlightsInPreview="false" showSelectionInPreview="true" openRemoteLinks="true" replaceUnicodeEmoji="false" lastLayoutSetsDefault="false">
-      <PanelProvider>
-        <provider providerId="com.vladsch.idea.multimarkdown.editor.swing.html.panel" providerName="Default - Swing" />
-      </PanelProvider>
-    </PreviewSettings>
-    <ParserSettings gitHubSyntaxChange="false" emojiShortcuts="1" emojiImages="0">
-      <PegdownExtensions>
-        <option name="ABBREVIATIONS" value="false" />
-        <option name="ANCHORLINKS" value="true" />
-        <option name="ASIDE" value="false" />
-        <option name="ATXHEADERSPACE" value="true" />
-        <option name="AUTOLINKS" value="true" />
-        <option name="DEFINITIONS" value="false" />
-        <option name="DEFINITION_BREAK_DOUBLE_BLANK_LINE" value="false" />
-        <option name="FENCED_CODE_BLOCKS" value="true" />
-        <option name="FOOTNOTES" value="false" />
-        <option name="HARDWRAPS" value="false" />
-        <option name="HTML_DEEP_PARSER" value="false" />
-        <option name="INSERTED" value="false" />
-        <option name="QUOTES" value="false" />
-        <option name="RELAXEDHRULES" value="true" />
-        <option name="SMARTS" value="false" />
-        <option name="STRIKETHROUGH" value="true" />
-        <option name="SUBSCRIPT" value="false" />
-        <option name="SUPERSCRIPT" value="false" />
-        <option name="SUPPRESS_HTML_BLOCKS" value="false" />
-        <option name="SUPPRESS_INLINE_HTML" value="false" />
-        <option name="TABLES" value="true" />
-        <option name="TASKLISTITEMS" value="true" />
-        <option name="TOC" value="false" />
-        <option name="WIKILINKS" value="false" />
-      </PegdownExtensions>
-      <ParserOptions>
-        <option name="ADMONITION_EXT" value="false" />
-        <option name="ATTRIBUTES_EXT" value="false" />
-        <option name="COMMONMARK_LISTS" value="true" />
-        <option name="DUMMY" value="false" />
-        <option name="EMOJI_SHORTCUTS" value="true" />
-        <option name="ENUMERATED_REFERENCES_EXT" value="false" />
-        <option name="FLEXMARK_FRONT_MATTER" value="false" />
-        <option name="GFM_LOOSE_BLANK_LINE_AFTER_ITEM_PARA" value="false" />
-        <option name="GFM_TABLE_RENDERING" value="true" />
-        <option name="GITBOOK_URL_ENCODING" value="false" />
-        <option name="GITHUB_LISTS" value="false" />
-        <option name="GITHUB_WIKI_LINKS" value="false" />
-        <option name="GITLAB_EXT" value="false" />
-        <option name="GITLAB_MATH_EXT" value="false" />
-        <option name="GITLAB_MERMAID_EXT" value="false" />
-        <option name="HEADER_ID_NON_ASCII_TO_LOWERCASE" value="false" />
-        <option name="HEADER_ID_NO_DUPED_DASHES" value="false" />
-        <option name="JEKYLL_FRONT_MATTER" value="false" />
-        <option name="MACROS_EXT" value="false" />
-        <option name="NO_TEXT_ATTRIBUTES" value="false" />
-        <option name="PARSE_HTML_ANCHOR_ID" value="false" />
-        <option name="PLANTUML_FENCED_CODE" value="false" />
-        <option name="PUML_FENCED_CODE" value="false" />
-        <option name="SIM_TOC_BLANK_LINE_SPACER" value="true" />
-      </ParserOptions>
-    </ParserSettings>
-    <HtmlSettings headerTopEnabled="false" headerBottomEnabled="false" bodyTopEnabled="false" bodyBottomEnabled="false" embedUrlContent="false" addPageHeader="true" embedImages="false" embedHttpImages="false" imageUriSerials="false" addDocTypeHtml="true" noParaTags="false" plantUmlConversion="0" mathConversion="-1">
-      <GeneratorProvider>
-        <provider providerId="com.vladsch.idea.multimarkdown.editor.swing.html.generator" providerName="Default Swing HTML Generator" />
-      </GeneratorProvider>
-      <headerTop />
-      <headerBottom />
-      <bodyTop />
-      <bodyBottom />
-    </HtmlSettings>
-    <CssSettings previewScheme="UI_SCHEME" cssUri="" isCssUriEnabled="false" isCssUriSerial="false" isCssTextEnabled="false" isDynamicPageWidth="true">
-      <StylesheetProvider>
-        <provider providerId="com.vladsch.idea.multimarkdown.editor.swing.html.css" providerName="Default Swing Stylesheet" />
-      </StylesheetProvider>
-      <ScriptProviders />
-      <cssText />
-      <cssUriHistory />
-    </CssSettings>
-    <AnnotatorSettings targetHasSpaces="true" linkCaseMismatch="true" wikiCaseMismatch="true" wikiLinkHasDashes="true" notUnderWikiHome="true" targetNotWikiPageExt="true" notUnderSourceWikiHome="true" targetNameHasAnchor="true" targetPathHasAnchor="true" wikiLinkHasSlash="true" wikiLinkHasSubdir="true" wikiLinkHasOnlyAnchor="true" linkTargetsWikiHasExt="true" linkTargetsWikiHasBadExt="true" notUnderSameRepo="true" targetNotUnderVcs="false" linkNeedsExt="true" linkHasBadExt="true" linkTargetNeedsExt="true" linkTargetHasBadExt="true" wikiLinkNotInWiki="true" imageTargetNotInRaw="true" repoRelativeAcrossVcsRoots="true" multipleWikiTargetsMatch="true" unresolvedLinkReference="true" linkIsIgnored="true" anchorIsIgnored="true" anchorIsUnresolved="true" anchorLineReferenceIsUnresolved="true" anchorLineReferenceFormat="true" anchorHasDuplicates="true" abbreviationDuplicates="true" abbreviationNotUsed="true" attributeIdDuplicateDefinition="true" attributeIdNotUsed="true" footnoteDuplicateDefinition="true" footnoteUnresolved="true" footnoteDuplicates="true" footnoteNotUsed="true" macroDuplicateDefinition="true" macroUnresolved="true" macroDuplicates="true" macroNotUsed="true" referenceDuplicateDefinition="true" referenceUnresolved="true" referenceDuplicates="true" referenceNotUsed="true" referenceUnresolvedNumericId="true" enumRefDuplicateDefinition="true" enumRefUnresolved="true" enumRefDuplicates="true" enumRefNotUsed="true" enumRefLinkUnresolved="true" enumRefLinkDuplicates="true" simTocUpdateNeeded="true" simTocTitleSpaceNeeded="true" />
-    <HtmlExportSettings updateOnSave="false" parentDir="" targetDir="" cssDir="css" scriptDir="js" plainHtml="false" imageDir="" copyLinkedImages="false" imageUniquifyType="0" targetPathType="2" targetExt="" useTargetExt="false" noCssNoScripts="false" useElementStyleAttribute="false" linkToExportedHtml="true" exportOnSettingsChange="true" regenerateOnProjectOpen="false" linkFormatType="HTTP_ABSOLUTE" />
-    <LinkMapSettings>
-      <textMaps />
-    </LinkMapSettings>
-  </component>
-</project>

package/.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/kfb-view.iml" filepath="$PROJECT_DIR$/.idea/kfb-view.iml" />
-    </modules>
-  </component>
-</project>

package/.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>

package/.idea/watcherTasks.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectTasksOptions" suppressed-tasks="SCSS" />
-</project>