file api refactorings and fixes

Mikhail Bezoyan · Mikhail Bezoyan · commit d73e7a8daa78 · 2014-01-27T11:57:36.000+04:00
diff --git a/flash/core/src/ru/mail/commands/ResizeFileCommand.as b/flash/core/src/ru/mail/commands/ResizeFileCommand.as
@@ -130,7 +130,8 @@ package ru.mail.commands
 				}
 				else 
 				{
-					currentImageMap = fullImageMap.clone();
+//					currentImageMap = fullImageMap.clone();
+                    currentImageMap = fullImageMap;
 				}
 				
 				// ==============
@@ -140,7 +141,7 @@ package ru.mail.commands
 				var angle:Number = imageTransform.deg*Math.PI/180;
 				var maxScale:Number = Math.max(scaleX, scaleY);
 				
-				if (maxScale < 0.5) {
+				if (imageTransform.multiPassResize && maxScale < 0.5) {
 					
 					trace ("multi-step ");
 					
diff --git a/flash/core/src/ru/mail/commands/UploadCommand.as b/flash/core/src/ru/mail/commands/UploadCommand.as
@@ -137,7 +137,9 @@ package ru.mail.commands
 					checkFilesPool();
 				});
 				
-				imageFactory.createImage( trans? new ImageTransformVO(trans.sx, trans.sy, trans.sw, trans.sh, trans.dw, trans.dh, trans.deg, trans.type, trans.quality, (trans.overlay is Array)? trans.overlay : [trans.overlay]) : null );
+				imageFactory.createImage( trans
+                        ? new ImageTransformVO(trans.sx, trans.sy, trans.sw, trans.sh, trans.dw, trans.dh, trans.deg, trans.type, trans.quality, (trans.overlay is Array)? trans.overlay : [trans.overlay], trans.multipass)
+                        : null );
 			}
 		}
 		
diff --git a/flash/core/src/ru/mail/controller/AppController.as b/flash/core/src/ru/mail/controller/AppController.as
@@ -582,7 +582,9 @@ package ru.mail.controller
 					}
 				});
 				
-				imageFactory.createImage( trans? new ImageTransformVO(trans.sx, trans.sy, trans.sw, trans.sh, trans.dw, trans.dh, trans.deg, trans.type, trans.quality, (trans.overlay is Array)? trans.overlay : [trans.overlay]) : null );
+				imageFactory.createImage( trans
+                        ? new ImageTransformVO(trans.sx, trans.sy, trans.sw, trans.sh, trans.dw, trans.dh, trans.deg, trans.type, trans.quality, (trans.overlay is Array)? trans.overlay : [trans.overlay], trans.multipass)
+                        : null);
 				}
 			catch (e:Error){
 				LoggerJS.log('imageFactory createImage error: '+e.toString());
diff --git a/flash/core/src/ru/mail/data/ImageFactory.as b/flash/core/src/ru/mail/data/ImageFactory.as
@@ -202,10 +202,13 @@ package ru.mail.data
 					trace ("bitmap created, isSuccess", event.isSuccess);
 					LoggerJS.log('ImageFactory bitmap created, success '+ event.isSuccess);
 					if (event.isSuccess) {
+                        file.imageData = event.decodedBitmap.bitmapData;
+/*
 						file.imageData = new BitmapData( event.decodedBitmap.width, event.decodedBitmap.height );
 						file.imageData.copyPixels( event.decodedBitmap.bitmapData
 							, new Rectangle( 0, 0, event.decodedBitmap.width, event.decodedBitmap.height ), new Point( 0, 0 ));
 						event.decodedBitmap.bitmapData.dispose();
+*/
 
 						createImageFromSource(imageTransform);
 					}
diff --git a/flash/core/src/ru/mail/data/vo/FakeFileVO.as b/flash/core/src/ru/mail/data/vo/FakeFileVO.as
@@ -45,12 +45,12 @@ package ru.mail.data.vo
 		 * @return 
 		 * 
 		 */		
-		public function get imageData():BitmapData 
+		public function get imageData():BitmapData
 		{
 			return _imageData;
 		}
 
-		public function set imageData(bd:BitmapData):void 
+		public function set imageData(bd:BitmapData):void
 		{
 			_imageData = bd;
 		}
diff --git a/flash/core/src/ru/mail/data/vo/ImageTransformVO.as b/flash/core/src/ru/mail/data/vo/ImageTransformVO.as
@@ -21,9 +21,10 @@ package ru.mail.data.vo
 		public var type:String = 'image/png'; // encoded image type. If type value is unknown, png is used
 		public var quality:Number = 1; // encode quality (jpeg only)
 		public var overlay:Array = []; // array of OverlayVO instances
+        public var multiPassResize: Boolean = true;
 
 		public function ImageTransformVO(sx:Number = 0, sy:Number = 0, sw:Number = 0, sh:Number = 0, dw:Number = 0, dh:Number = 0, deg:Number = 0
-										 , type:String = null, quality:Number = 1, overlay:Array = null)
+										 , type:String = null, quality:Number = 1, overlay:Array = null, multiPassResize:Boolean = true)
 		{
 			super();
 
@@ -45,6 +46,9 @@ package ru.mail.data.vo
 				this.type = type;
 			if ( !isNaN(quality) )
 				this.quality = quality;
+
+            this.multiPassResize = multiPassResize;
+
 			if ( overlay )
 				setOverlay( overlay );
 		}

Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,8 @@ package ru.mail.commands`
`130`	`130`	`}`
`131`	`131`	`else`
`132`	`132`	`{`
`133`		`- currentImageMap = fullImageMap.clone();`
	`133`	`+// currentImageMap = fullImageMap.clone();`
	`134`	`+ currentImageMap = fullImageMap;`
`134`	`135`	`}`
`135`	`136`
`136`	`137`	`// ==============`
`@@ -140,7 +141,7 @@ package ru.mail.commands`
`140`	`141`	`var angle:Number = imageTransform.deg*Math.PI/180;`
`141`	`142`	`var maxScale:Number = Math.max(scaleX, scaleY);`
`142`	`143`
`143`		`- if (maxScale < 0.5) {`
	`144`	`+ if (imageTransform.multiPassResize && maxScale < 0.5) {`
`144`	`145`
`145`	`146`	`trace ("multi-step ");`
`146`	`147`
Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,9 @@ package ru.mail.commands`
`137`	`137`	`checkFilesPool();`
`138`	`138`	`});`
`139`	`139`
`140`		`- imageFactory.createImage( trans? new ImageTransformVO(trans.sx, trans.sy, trans.sw, trans.sh, trans.dw, trans.dh, trans.deg, trans.type, trans.quality, (trans.overlay is Array)? trans.overlay : [trans.overlay]) : null );`
	`140`	`+ imageFactory.createImage( trans`
	`141`	`+ ? new ImageTransformVO(trans.sx, trans.sy, trans.sw, trans.sh, trans.dw, trans.dh, trans.deg, trans.type, trans.quality, (trans.overlay is Array)? trans.overlay : [trans.overlay], trans.multipass)`
	`142`	`+ : null );`
`141`	`143`	`}`
`142`	`144`	`}`
`143`	`145`
Original file line number	Diff line number	Diff line change
`@@ -582,7 +582,9 @@ package ru.mail.controller`
`582`	`582`	`}`
`583`	`583`	`});`
`584`	`584`
`585`		`- imageFactory.createImage( trans? new ImageTransformVO(trans.sx, trans.sy, trans.sw, trans.sh, trans.dw, trans.dh, trans.deg, trans.type, trans.quality, (trans.overlay is Array)? trans.overlay : [trans.overlay]) : null );`
	`585`	`+ imageFactory.createImage( trans`
	`586`	`+ ? new ImageTransformVO(trans.sx, trans.sy, trans.sw, trans.sh, trans.dw, trans.dh, trans.deg, trans.type, trans.quality, (trans.overlay is Array)? trans.overlay : [trans.overlay], trans.multipass)`
	`587`	`+ : null);`
`586`	`588`	`}`
`587`	`589`	`catch (e:Error){`
`588`	`590`	`LoggerJS.log('imageFactory createImage error: '+e.toString());`
Original file line number	Diff line number	Diff line change
`@@ -45,12 +45,12 @@ package ru.mail.data.vo`
`45`	`45`	`* @return`
`46`	`46`	`*`
`47`	`47`	`*/`
`48`		`- public function get imageData():BitmapData`
	`48`	`+ public function get imageData():BitmapData`
`49`	`49`	`{`
`50`	`50`	`return _imageData;`
`51`	`51`	`}`
`52`	`52`
`53`		`- public function set imageData(bd:BitmapData):void`
	`53`	`+ public function set imageData(bd:BitmapData):void`
`54`	`54`	`{`
`55`	`55`	`_imageData = bd;`
`56`	`56`	`}`