Roo/dialog/UploadCropbox.js

[roojs1] / Roo / dialog / UploadCropbox.js

diff --git a/Roo/dialog/UploadCropbox.js b/Roo/dialog/UploadCropbox.js
index e921eaf..6271d21 100644 (file)
--- a/Roo/dialog/UploadCropbox.js
+++ b/Roo/dialog/UploadCropbox.js
@@ -466,7 +466,6 @@ Roo.extend(Roo.dialog.UploadCropbox, Roo.Component,  {
     
     setCanvasPosition : function()
     {   
-        console.log("SET CANVAS POSITION");
         if(!this.canvasEl){
             return;
         }
@@ -559,14 +558,11 @@ Roo.extend(Roo.dialog.UploadCropbox, Roo.Component,  {
         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();
         
@@ -580,14 +576,14 @@ Roo.extend(Roo.dialog.UploadCropbox, Roo.Component,  {
         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;
@@ -620,8 +616,8 @@ Roo.extend(Roo.dialog.UploadCropbox, Roo.Component,  {
                 !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
                 )
@@ -764,14 +760,11 @@ Roo.extend(Roo.dialog.UploadCropbox, Roo.Component,  {
     
     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();
@@ -853,6 +846,7 @@ Roo.extend(Roo.dialog.UploadCropbox, Roo.Component,  {
     
     crop : function()
     {
+        console.log("CROP");
         if(!this.canvasLoaded){
             return;
         }
@@ -863,6 +857,9 @@ Roo.extend(Roo.dialog.UploadCropbox, Roo.Component,  {
         
         imageCanvas.width = (this.imageEl.OriginWidth > this.imageEl.OriginHeight) ? this.imageEl.OriginWidth : this.imageEl.OriginHeight;
         imageCanvas.height = (this.imageEl.OriginWidth > this.imageEl.OriginHeight) ? this.imageEl.OriginWidth : this.imageEl.OriginHeight;
+
+        console.log("IMAGECANVAS WIDTH: " + imageCanvas.width);
+        console.log("IMAGECANVAS HEIGHT: " + imageCanvas.height);
         
         var center = imageCanvas.width / 2;
         
@@ -875,44 +872,64 @@ Roo.extend(Roo.dialog.UploadCropbox, Roo.Component,  {
         var canvas = document.createElement("canvas");
         
         var context = canvas.getContext("2d");
-                
-        canvas.width = this.minWidth;
-        canvas.height = this.minHeight;
+
+        canvas.width = this.thumbEl.getWidth() / this.getScaleLevel();
+        
+        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 :
                 
                 var width = (this.thumbEl.getWidth() / this.getScaleLevel() > this.imageEl.OriginWidth) ? this.imageEl.OriginWidth : (this.thumbEl.getWidth() / this.getScaleLevel());
                 var height = (this.thumbEl.getHeight() / this.getScaleLevel() > this.imageEl.OriginHeight) ? this.imageEl.OriginHeight : (this.thumbEl.getHeight() / this.getScaleLevel());
+
+                console.log("WIDTH: " + width);
+                console.log("HEIGHT: " + height);
                 
                 var x = (this.thumbEl.getLeft(true) > this.previewEl.getLeft(true)) ? 0 : ((this.previewEl.getLeft(true) - this.thumbEl.getLeft(true)) / this.getScaleLevel());
                 var y = (this.thumbEl.getTop(true) > this.previewEl.getTop(true)) ? 0 : ((this.previewEl.getTop(true) - this.thumbEl.getTop(true)) / this.getScaleLevel());
+
+                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);
                 
-                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);
                 
-                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);
 
                 sx = sx < 0 ? 0 : (sx / this.getScaleLevel());
                 sy = sy < 0 ? 0 : (sy / this.getScaleLevel());