kfb-view 2.1.9 → 2.1.12

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "kfb-view",
   "description": "一个在线kfb的阅片软件",
-  "version": "2.1.9",
+  "version": "2.1.12",
   "author": "qifeng.fan <qifeng.fan@hzztai.com>",
   "license": "MIT",
   "main": "lib/kfb-view.js",
@@ -34,7 +34,7 @@
     "@babel/plugin-proposal-function-bind": "^7.0.0",
     "@babel/plugin-proposal-function-sent": "^7.0.0",
     "@babel/plugin-proposal-json-strings": "^7.0.0",
-    "@babel/plugin-proposal-nullish-coalescing-operator": "^7.12.1",
+    "@babel/plugin-proposal-nullish-coalescing-operator": "^7.0.0",
     "@babel/plugin-proposal-numeric-separator": "^7.0.0",
     "@babel/plugin-proposal-object-rest-spread": "^7.3.1",
     "@babel/plugin-proposal-optional-chaining": "^7.0.0",

package/src/components/tailoring/index.js

@@ -41,6 +41,7 @@ export class Tailoring extends ViewerCommon {
       pointList[8]];
     if (now) {
       this.$emit(EVENT_TAILORING_SCREENSHOT, this.getScreenCanvasImage());
+      this.stopTailoring();
     } else {
       this.color = color || '#FFF';
       this.change();
@@ -226,15 +227,10 @@ export class Tailoring extends ViewerCommon {
   }
 
   onCanvasDblClick(position) {
-    if (this.tailoringPoints.length === 0) {
-      this.stopTailoring();
-    } else {
-      if (this.isPointInMatrix(position)) {
-        this.$emit(EVENT_TAILORING_SCREENSHOT, this.getScreenCanvasImage());
-      } else {
-        this.stopTailoring();
-      }
+    if (this.tailoringPoints.length > 0 && this.isPointInMatrix(position)) {
+      this.$emit(EVENT_TAILORING_SCREENSHOT, this.getScreenCanvasImage());
     }
+    this.stopTailoring();
   }
 
   /**

package/src/index.js

@@ -1,9 +1,10 @@
 export * from './util/calculate';
 export * from './util/imageData';
 export * from './components';
-
+import OpenSeadragon from './plugin/openseadragon/openseadragon';
 import KfbView from './view';
 
 export {
   KfbView,
+  OpenSeadragon,
 };

package/src/util/imageData.js

@@ -36,9 +36,9 @@ export const rgbToHsl = (r, g, b) => {
 export const hslToRgb = (h, s, l) => {
   if (s === 0) {
     return {
-      r: l * 255,
-      g: l * 255,
-      b: l * 255,
+      r: (l > 1 ? 1 : l) * 255,
+      g: (l > 1 ? 1 : l) * 255,
+      b: (l > 1 ? 1 : l) * 255,
     };
   }
   if (s > 1) s = 1;
@@ -52,7 +52,11 @@ export const hslToRgb = (h, s, l) => {
   const r = 255 * hueToRGB(v1, v2, h + (1 / 3));
   const g = 255 * hueToRGB(v1, v2, h);
   const b = 255 * hueToRGB(v1, v2, h - (1 / 3));
-  return {r, g, b};
+  return {
+    r: r > 255 ? 255 : r,
+    g: g > 255 ? 255 : g,
+    b: b > 255 ? 255 : b,
+  };
 };
 
 function hueToRGB(v1, v2, h) {
@@ -72,14 +76,14 @@ export const toGamma = (num, gamma) => {
     num = 0;
   }
   num = num / 255;
-  const compensate = Math.pow(num, gamma);
+  const compensate = Math.pow(num, 1 / gamma);
   return compensate * 255;
 };
 
 const cacheGammaTable = {};
 
 for (let i = 0; i < 256; i++) {
-  for (let j = 0.01; j <= 5; j = ((j + 0.01).toFixed(3) / 1)) {
+  for (let j = 0.01; j <= 2; j = ((j + 0.01).toFixed(3) / 1)) {
     if (cacheGammaTable[`${j}`]) {
       cacheGammaTable[`${j}`].push(toGamma(i, j));
     } else {