this.startScale = this.scale;
this.scale = (e.getWheelDelta() == 1) ? (this.scale + 1) : (this.scale - 1);
- console.log("START SCALE:" + this.startScale);
- console.log("TEST SCALE: " + this.scale);
if(!this.zoomable()){
this.scale = this.startScale;
return;
}
- console.log("END SCALE: " + this.scale);
this.draw();
if(this.minWidth < this.minHeight){
minScale = this.thumbEl.getHeight() / this.minHeight;
}
-
- console.log("MINSCALE: " + minScale);
var width = Math.ceil(this.imageEl.OriginWidth * this.getScaleLevel() / minScale);
var height = Math.ceil(this.imageEl.OriginHeight * this.getScaleLevel() / minScale);
- console.log("WIDTH: " + width);
- console.log("HEIGHT: " + height);
+ console.log("ZOOM");
+ console.log("WIDTH: " + (this.thumbEl.getWidth() / this.getScaleLevel()));
+ console.log("HEIGHT: " + (this.thumbEl.getHeight() / this.getScaleLevel()));
+
var maxWidth = this.imageEl.OriginWidth;
var maxHeight = this.imageEl.OriginHeight;
!this.isDocument &&
(this.rotate == 0 || this.rotate == 180) &&
(
- width < this.minWidth ||
- height < this.minHeight ||
+ (this.imageEl.OriginWidth >= this.minWidth) && width < this.minWidth ||
+ (this.imageEl.OriginHeight >= this.minHeight) && height < this.minHeight ||
width > maxWidth ||
height > maxHeight
)
draw : function()
{
- console.log("DRAW");
this.previewEl.dom.innerHTML = '';
var canvasEl = document.createElement("canvas");
var contextEl = canvasEl.getContext("2d");
-
- console.log(this.getScaleLevel());
canvasEl.width = this.imageEl.OriginWidth * this.getScaleLevel();
canvasEl.height = this.imageEl.OriginWidth * this.getScaleLevel();
var canvas = document.createElement("canvas");
var context = canvas.getContext("2d");
-
- canvas.width = this.minWidth;
+
+ canvas.width = this.thumbEl.getWidth() / this.getScaleLevel();
- canvas.height = this.minHeight;
+ canvas.height = this.thumbEl.getHeight() / this.getScaleLevel();
console.log("CANVAS WIDTH: " + canvas.width);
console.log("CANVAS HEIGHT: " + canvas.height);
+ console.log("SCALELEVLE: " + scaleLevel);
+
switch (this.rotate) {
case 0 :
console.log("X: " + x);
console.log("Y: " + y);
- var targetWidth = this.minWidth - 2 * x;
- var targetHeight = this.minHeight - 2 * y;
+ // var targetWidth = this.minWidth - 2 * x;
+ // var targetHeight = this.minHeight - 2 * y;
- console.log("targetWidth: " + targetWidth);
- console.log("targetHeight: " + targetHeight);
+ // console.log("targetWidth: " + targetWidth);
+ // console.log("targetHeight: " + targetHeight);
- var scale = 1;
+ // var scale = 1;
- if((x == 0 && y == 0) || (x == 0 && y > 0)){
- scale = targetWidth / width;
- }
+ // if((x == 0 && y == 0) || (x == 0 && y > 0)){
+ // scale = targetWidth / width;
+ // }
- if(x > 0 && y == 0){
- scale = targetHeight / height;
- }
+ // if(x > 0 && y == 0){
+ // scale = targetHeight / height;
+ // }
- if(x > 0 && y > 0){
- scale = targetWidth / width;
+ // if(x > 0 && y > 0){
+ // scale = targetWidth / width;
- if(width < height){
- scale = targetHeight / height;
- }
- }
+ // if(width < height){
+ // scale = targetHeight / height;
+ // }
+ // }
- console.log("scale: " + scale);
+ // console.log("scale: " + scale);
- context.scale(scale, scale);
+ // context.scale(scale, scale);
- var sx = Math.min(this.canvasEl.width - this.thumbEl.getWidth(), this.thumbEl.getLeft(true) - this.previewEl.getLeft(true));
- var sy = Math.min(this.canvasEl.height - this.thumbEl.getHeight(), this.thumbEl.getTop(true) - this.previewEl.getTop(true));
+ var sx = this.thumbEl.getLeft(true) - this.previewEl.getLeft(true);
+ var sy = this.thumbEl.getTop(true) - this.previewEl.getTop(true);
console.log("sx: " + sx);
console.log("sy: " + sy);