チェンジセット 3624
- コミット日時:
- 2010/03/28 16:08:40 (3 年前)
- ファイル:
-
- as3/gunyarapaint/branches/gunyarapaint/compat/src/org/libspark/gunyarapaint/ui/v1/CanvasController.as (更新) (3 diffs)
- as3/gunyarapaint/branches/gunyarapaint/compat/src/org/libspark/gunyarapaint/ui/v1/FormController.mxml (更新) (1 diff)
- as3/gunyarapaint/branches/gunyarapaint/compat/src/org/libspark/gunyarapaint/ui/v1/IController.as (更新) (1 diff)
- as3/gunyarapaint/branches/gunyarapaint/compat/src/org/libspark/gunyarapaint/ui/v1/LayerController.mxml (更新) (7 diffs)
- as3/gunyarapaint/branches/gunyarapaint/compat/src/org/libspark/gunyarapaint/ui/v1/PenController.mxml (更新) (9 diffs)
- as3/gunyarapaint/branches/gunyarapaint/compat/src/org/libspark/gunyarapaint/ui/v1/ToolController.mxml (更新) (4 diffs)
凡例:
- 変更無し
- 追加
- 削除
- 更新
- コピー
- 移動
as3/gunyarapaint/branches/gunyarapaint/compat/src/org/libspark/gunyarapaint/ui/v1/CanvasController.as
r3605 r3624 5 5 import flash.geom.Point; 6 6 import flash.geom.Rectangle; 7 import flash.utils.ByteArray; 7 8 8 9 import mx.containers.TitleWindow; … … 53 54 } 54 55 56 public function load(data:Object):void 57 { 58 var rect:Object = data.rectangle; 59 move(rect.x, rect.y); 60 width = rect.width; 61 height = rect.height; 62 m_canvas.auxBoxVisible = data.auxBoxVisible; 63 m_canvas.auxSkewVisible = data.auxSkewVisible; 64 m_canvas.auxDivideCount = data.auxDivideCount; 65 m_canvas.auxLineAlpha = data.auxLineAlpha; 66 m_canvas.auxLineColor = data.auxLineColor; 67 m_canvas.enableAuxPixel = data.enableAuxPixel; 68 } 69 70 public function save(data:Object):void 71 { 72 data.rectangle = new Rectangle(x, y, width, height); 73 data.auxBoxVisible = m_canvas.auxBoxVisible; 74 data.auxSkewVisible = m_canvas.auxSkewVisible; 75 data.auxDivideCount = m_canvas.auxDivideCount; 76 data.auxLineAlpha = m_canvas.auxLineAlpha; 77 data.auxLineColor = m_canvas.auxLineColor; 78 data.enableAuxPixel = m_canvas.enableAuxPixel; 79 } 80 81 public function resetWindow():void 82 { 83 move(m_initRectangle.x, m_initRectangle.y); 84 width = m_initRectangle.width; 85 height = m_initRectangle.height; 86 rotate(0); 87 transform.matrix = new Matrix( 88 1, 0, 0, 1, m_initRectangle.x, m_initRectangle.y 89 ); 90 } 91 55 92 public function zoom(value:Number):void 56 93 { … … 81 118 m_canvasY = y; 82 119 update(); 83 }84 85 public function resetWindow():void86 {87 move(m_initRectangle.x, m_initRectangle.y);88 width = m_initRectangle.width;89 height = m_initRectangle.height;90 rotate(0);91 transform.matrix = new Matrix(92 1, 0, 0, 1, m_initRectangle.x, m_initRectangle.y93 );94 120 } 95 121 as3/gunyarapaint/branches/gunyarapaint/compat/src/org/libspark/gunyarapaint/ui/v1/FormController.mxml
r3605 r3624 11 11 12 12 private var baseImg:BitmapData; 13 14 public function load(data:Object):void 15 { 16 var point:Object = data.point; 17 move(point.x, point.y); 18 fromTextInput.text = data.from; 19 titleTextInput.text = data.title; 20 messageTextArea.text = data.message; 21 } 22 23 public function save(data:Object):void 24 { 25 data.point = new Point(x, y); 26 data.from = fromTextInput.text; 27 data.title = titleTextInput.text; 28 data.message = messageTextArea.text; 29 } 13 30 14 31 public function resetWindow():void as3/gunyarapaint/branches/gunyarapaint/compat/src/org/libspark/gunyarapaint/ui/v1/IController.as
r3605 r3624 1 1 package org.libspark.gunyarapaint.ui.v1 2 2 { 3 import flash.utils.ByteArray; 4 3 5 public interface IController 4 6 { 5 function resetWindow():void 7 function load(data:Object):void; 8 function save(data:Object):void; 9 function resetWindow():void; 10 function get name():String; 6 11 } 7 12 } as3/gunyarapaint/branches/gunyarapaint/compat/src/org/libspark/gunyarapaint/ui/v1/LayerController.mxml
r3605 r3624 21 21 private static const NAME:String = "レイヤーツール"; 22 22 23 public function load(data:Object):void 24 { 25 var point:Object = data.point; 26 move(point.x, point.y); 27 update(); 28 } 29 30 public function save(data:Object):void 31 { 32 data.point = new Point(x, y); 33 } 34 35 public function resetWindow():void 36 { 37 move(m_initPosition.x, m_initPosition.y); 38 } 39 23 40 public function update():void 24 41 { … … 37 54 } 38 55 } 39 }40 41 public function resetWindow():void42 {43 move(m_initPosition.x, m_initPosition.y);44 56 } 45 57 … … 68 80 private function onClickLayer(evt:ListEvent):void 69 81 { 70 var app lication:IApplication = IApplication(Application.application);82 var app:IApplication = IApplication(Application.application); 71 83 var layer:LayerBitmap = LayerBitmap(evt.currentTarget.selectedItem); 72 if (app lication.layers.currentIndex != layer.index)73 app lication.module.layerIndex = layer.index;84 if (app.layers.currentIndex != layer.index) 85 app.canvasModule.layerIndex = layer.index; 74 86 } 75 87 76 88 private function onCreateLayer(evt:Event):void 77 89 { 78 IApplication(Application.application).module.createLayer(); 90 var app:IApplication = IApplication(Application.application); 91 app.canvasModule.createLayer(); 79 92 update(); 80 93 } … … 82 95 private function onCopyLayer(evt:Event):void 83 96 { 84 IApplication(Application.application).module.copyLayer(); 97 var app:IApplication = IApplication(Application.application); 98 app.canvasModule.copyLayer(); 85 99 update(); 86 100 } … … 90 104 try { 91 105 // RemoveLayerErrorを捉える必要がある 92 IApplication(Application.application).module.removeLayer(); 106 var app:IApplication = IApplication(Application.application); 107 app.canvasModule.removeLayer(); 93 108 update(); 94 109 } catch (e:Error) { … … 101 116 try { 102 117 // MergeLayersErrorを捉える必要がある 103 IApplication(Application.application).module.mergeLayers(); 118 var app:IApplication = IApplication(Application.application); 119 app.canvasModule.mergeLayers(); 104 120 update(); 105 121 } catch (e:Error) { … … 115 131 private function onChangeAlphaSlider(evt:SliderEvent):void 116 132 { 117 IApplication(Application.application).module.layerAlpha = evt.value; 133 var app:IApplication = IApplication(Application.application); 134 app.canvasModule.layerAlpha = evt.value; 118 135 } 119 136 120 137 private function onSelectBlendMode(evt:ListEvent):void 121 138 { 122 IApplication(Application.application).module.layerBlendMode = String(evt.currentTarget.value); 139 var app:IApplication = IApplication(Application.application); 140 app.canvasModule.layerBlendMode = String(evt.currentTarget.value); 123 141 } 124 142 125 143 private function onDragComplete(evt:DragEvent):void 126 144 { 127 var app lication:IApplication = IApplication(Application.application);145 var app:IApplication = IApplication(Application.application); 128 146 var a:Array = (layerDataGrid.dataProvider as ArrayCollection).toArray().reverse(); 129 147 var length:uint = a.length; 130 var layers:LayerBitmapCollection = app lication.layers;148 var layers:LayerBitmapCollection = app.layers; 131 149 for (var i:uint = 0; i < length; i++) { 132 150 var from:uint = a[i].index; 133 151 var to:uint = layers.at(i).index; 134 152 if (a[i].index != to) { 135 app lication.module.swapLayers(from, to);153 app.canvasModule.swapLayers(from, to); 136 154 break; 137 155 } as3/gunyarapaint/branches/gunyarapaint/compat/src/org/libspark/gunyarapaint/ui/v1/PenController.mxml
r3605 r3624 32 32 private var m_palette:GridItem; 33 33 34 public function load(data:Object):void 35 { 36 var app:IApplication = IApplication(Application.application); 37 var pen:Pen = app.pen; 38 var point:Object = data.point; 39 move(point.x, point.y); 40 this.pen = data.state; 41 pen.alpha = data.alpha; 42 pen.color = data.color; 43 pen.thickness = data.thickness; 44 palettes = data.palettes; 45 } 46 47 public function save(data:Object):void 48 { 49 var app:IApplication = IApplication(Application.application); 50 var pen:Pen = app.pen; 51 data.point = new Point(x, y); 52 data.alpha = pen.alpha; 53 data.color = pen.color; 54 data.thickness = pen.thickness; 55 data.state = app.canvasModule.name; 56 data.palettes = palettes; 57 } 58 59 public function resetWindow():void 60 { 61 move(m_initPosition.x, m_initPosition.y); 62 } 63 34 64 // Ctrlとかのショートカットキーで変わったペンToolを戻す 35 65 public function reset():void … … 44 74 else if (eraserButton.selected) { 45 75 pen = LineModule.LINE; 46 app. module.blendMode = BlendMode.ERASE;76 app.canvasModule.blendMode = BlendMode.ERASE; 47 77 } 48 78 else if (dotButton.selected) { … … 51 81 else { 52 82 pen = String(blendModeComboBox.value); 53 app. module.blendMode = String(blendModeComboBox.value);83 app.canvasModule.blendMode = String(blendModeComboBox.value); 54 84 } 55 85 } … … 64 94 dotButton.selected = false; 65 95 var app:IApplication = IApplication(Application.application); 66 app.setModule(String(penModeComboBox.value)); 67 } 68 69 public function resetWindow():void 70 { 71 move(m_initPosition.x, m_initPosition.y); 96 app.setCanvasModule(String(penModeComboBox.value)); 72 97 } 73 98 … … 113 138 public function set pen(mode:String):void 114 139 { 140 var app:IApplication = IApplication(Application.application); 115 141 currentState = mode; 116 IApplication(Application.application).setModule(currentState);142 app.setCanvasModule(currentState); 117 143 } 118 144 119 145 public function set currentColor(value:uint):void 120 146 { 121 IApplication(Application.application).module.color = value; 147 var app:IApplication = IApplication(Application.application); 148 app.canvasModule.color = value; 122 149 } 123 150 124 151 public function set currentAlpha(value:Number):void 125 152 { 126 IApplication(Application.application).module.alpha = value; 153 var app:IApplication = IApplication(Application.application); 154 app.canvasModule.alpha = value; 127 155 } 128 156 129 157 public function set currentThickness(value:uint):void 130 158 { 131 IApplication(Application.application).module.thickness = value; 159 var app:IApplication = IApplication(Application.application); 160 app.canvasModule.thickness = value; 132 161 } 133 162 … … 243 272 { 244 273 if (Button(evt.currentTarget).selected) { 274 var app:IApplication = IApplication(Application.application); 245 275 pen = FreeHandModule.FREE_HAND; 246 276 currentState = "eraser"; 247 IApplication(Application.application).module.blendMode = BlendMode.ERASE;277 app.canvasModule.blendMode = BlendMode.ERASE; 248 278 } 249 279 else { … … 263 293 { 264 294 cancel(); 265 var app lication:IApplication = IApplication(Application.application);266 app lication.setModule(String(evt.currentTarget.value));295 var app:IApplication = IApplication(Application.application); 296 app.setCanvasModule(String(evt.currentTarget.value)); 267 297 } 268 298 … … 270 300 { 271 301 cancel(); 272 IApplication(Application.application).module.blendMode = String(evt.currentTarget.value); 302 var app:IApplication = IApplication(Application.application); 303 app.canvasModule.blendMode = String(evt.currentTarget.value); 273 304 } 274 305 … … 308 339 { 309 340 pen = String(penModeComboBox.value); 310 IApplication(Application.application).module.blendMode = String(blendModeComboBox.value); 341 var app:IApplication = IApplication(Application.application); 342 app.canvasModule.blendMode = String(blendModeComboBox.value); 311 343 } 312 344 as3/gunyarapaint/branches/gunyarapaint/compat/src/org/libspark/gunyarapaint/ui/v1/ToolController.mxml
r3605 r3624 17 17 import org.libspark.gunyarapaint.framework.ui.IApplication; 18 18 19 public function load(data:Object):void 20 { 21 var point:Object = data.point; 22 move(point.x, point.y); 23 setRotate(data.rotate); 24 setZoom(data.zoom); 25 } 26 27 public function save(data:Object):void 28 { 29 data.point = new Point(x, y); 30 data.rotate = canvasRotate.value; 31 data.zoom = canvasZoom.value; 32 } 33 34 public function resetWindow():void 35 { 36 move(m_initPosition.x, m_initPosition.y); 37 setRotate(0); 38 setZoom(1); 39 } 40 19 41 public function setRotate(value:Number):void 20 42 { … … 33 55 Application.application.canvasController.zoom(value); 34 56 canvasZoomValue.text = String(Math.round(n) / 100); 35 }36 37 public function resetWindow():void38 {39 move(m_initPosition.x, m_initPosition.y);40 setRotate(0);41 setZoom(1);42 57 } 43 58 … … 162 177 <mx:CheckBox id="additionalBoxCheckBox" y="2" label="縦横" right="8" fontSize="9" height="18" change="onChangeAuxBoxVisible(event)"/> 163 178 <mx:CheckBox id="additionalSkewCheckBox" y="18" label="斜め" right="9" fontSize="9" height="18" change="onChangeAuxSkewVisible(event)"/> 164 <mx:Button id="undoButton" y="38" label="アンドゥ" enabled="false" paddingLeft="3" paddingRight="3" right="89" buttonDown="IApplication(Application.application). module.undo()"/>165 <mx:Button id="redoButton" y="38" label="リドゥ" enabled="false" paddingLeft="3" paddingRight="3" right="12" buttonDown="IApplication(Application.application). module.redo()"/>179 <mx:Button id="undoButton" y="38" label="アンドゥ" enabled="false" paddingLeft="3" paddingRight="3" right="89" buttonDown="IApplication(Application.application).canvasModule.undo()"/> 180 <mx:Button id="redoButton" y="38" label="リドゥ" enabled="false" paddingLeft="3" paddingRight="3" right="12" buttonDown="IApplication(Application.application).canvasModule.redo()"/> 166 181 <mx:Button id="logPlayButton" y="105" label="ログプレイ" visible="false" right="99"/> 167 182 <mx:Button id="checkPngButton" y="105" label="同一check" visible="false" right="10"/> … … 173 188 </mx:ComboBox> 174 189 <mx:Button id="windowsResetButton" x="146" y="136" label="ウィンドウ初期状態" width="104" paddingLeft="0" paddingRight="0" paddingTop="0" paddingBottom="0" height="17" buttonDown="Application.application.resetWindowsPosition()"/> 175 <mx:Button id="horizontalMirrorButton" x="10" y="111" label="全レイヤー左右反転" width="120" paddingLeft="0" paddingRight="0" paddingTop="0" paddingBottom="0" height="17" buttonDown="IApplication(Application.application). module.horizontalMirror(Painter.ALL_LAYERS)"/>176 <mx:Button id="verticalMirrorButton" x="10" y="136" label="全レイヤー上下反転" width="120" paddingLeft="0" paddingRight="0" paddingTop="0" paddingBottom="0" height="17" buttonDown="IApplication(Application.application). module.verticalMirror(Painter.ALL_LAYERS)"/>190 <mx:Button id="horizontalMirrorButton" x="10" y="111" label="全レイヤー左右反転" width="120" paddingLeft="0" paddingRight="0" paddingTop="0" paddingBottom="0" height="17" buttonDown="IApplication(Application.application).canvasModule.horizontalMirror(Painter.ALL_LAYERS)"/> 191 <mx:Button id="verticalMirrorButton" x="10" y="136" label="全レイヤー上下反転" width="120" paddingLeft="0" paddingRight="0" paddingTop="0" paddingBottom="0" height="17" buttonDown="IApplication(Application.application).canvasModule.verticalMirror(Painter.ALL_LAYERS)"/> 177 192 <mx:Button id="passwordButton" x="146" y="111" label="ふっかつのじゅもん" width="104" paddingLeft="0" paddingRight="0" paddingTop="0" paddingBottom="0" height="17" buttonDown="onLoad(event)"/> 178 193 </mx:Canvas>

