チェンジセット 3503: as3/gunyarapaint

コミット日時:

2010/03/07 13:50:38 (3 年前)

コミッタ:

hkrn

ログメッセージ:

IDelegate to IApplication, removed canvas suffix from the methods in GPCanvasWindowControl.as

ファイル:

• as3/gunyarapaint/branches/gunyarapaint/compat/src/gunyarapaint.as (更新) (14 diffs)
• as3/gunyarapaint/branches/gunyarapaint/compat/src/gunyarapaint.mxml (更新) (1 diff)
• as3/gunyarapaint/branches/gunyarapaint/compat/src/org/libspark/gunyarapaint/controls/GPCanvas.as (更新) (3 diffs)
• as3/gunyarapaint/branches/gunyarapaint/compat/src/org/libspark/gunyarapaint/controls/GPCanvasWindowControl.as (更新) (10 diffs)
• as3/gunyarapaint/branches/gunyarapaint/compat/src/org/libspark/gunyarapaint/controls/GPLayerWindowControl.mxml (更新) (7 diffs)
• as3/gunyarapaint/branches/gunyarapaint/compat/src/org/libspark/gunyarapaint/controls/IDelegate.as (削除)
• as3/gunyarapaint/branches/gunyarapaint/compat/src/org/libspark/gunyarapaint/controls/PenDetailWindowControl.mxml (更新) (13 diffs)

as3/gunyarapaint/branches/gunyarapaint/compat/src/gunyarapaint.as

@@ -30 +30 @@
-private var m_recorder:Recorder;
-private var m_module:IDrawable;
+private var m_commit:uint;
-
-private var basex:uint = 0;
@@ -93 +94 @@
-}
-
-
+
+
+
+
+
+
+
+
+
-{
-    var width:int = 0;
@@ -112 +121 @@
-        parameters['canvasHeight'] = 317;
-    }
+    
-    width = int(parameters['canvasWidth']);
-    height = int(parameters['canvasHeight']);
-    undoBufferSize = int(parameters['undoBufferSize']);
+    
-    m_recorder = new Recorder(new ByteArray());
-    m_recorder.prepare(width, height, undoBufferSize);
-    m_module = DrawModuleFactory.create(DrawModuleFactory.FREE_HAND, m_recorder);
-
-m_recorder.addEventListener(CommandEvent.COMMITTED, commitHandler);
-UndoEvent.UNDO, changeUndoRedoHandler
-REDO, changeUndoRedoHandler
-PUSH, changeUndoRedoHandler
-//gpCanvasWindow.delegate = penDetailWindow.delegate = this
-
-
-commitHandler
+m_commit = 0;
+
+CommandEvent.COMMITTED, onCommit
+UNDO, onChangeUndo
+REDO, onChangeUndo
+m_recorder.addEventListener(UndoEvent.PUSH, onChangeUndo)
+
+
+onCommit
-{
-    //trace(event.command);
-
-
-
+
+
+
+
-{
-    var width:uint = 0;
@@ -198 +210 @@
-}
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
-private function windowsResetButtonHandler(evt:FlexEvent):void
-{
-Canvas
+
-    
-    gpCanvasWindow.transform.matrix = new Matrix(1, 0, 0, 1, initCanvasWindowPos.x, initCanvasWindowPos.y);
@@ -225 +416 @@
-    PopUpManager.addPopUp(w, this, true);
-    // w.password = gpCanvas.logger.password;
-}
-
-private function appComplete():void
-{
-    stage.addEventListener(KeyboardEvent.KEY_DOWN, shortCutKeyDownHandler);  
-    stage.addEventListener(KeyboardEvent.KEY_UP, shortCutKeyUpHandler);  
-    stage.addEventListener(MouseEvent.MOUSE_UP, mouseUpHandler);
-    stage.addEventListener(MouseEvent.MOUSE_OUT, mouseUpHandler); // これを入れるとマズい。
-}
-
-// canvasでの外のmouseUpをcanvasに通知  
-private function mouseUpHandler(evt:MouseEvent):void
-{
-    module.interrupt(evt.localX, evt.localY);
-}
-
@@ -297 +474 @@
-    if (evt.value >= 1) {
-        canvasZoomValue.text = String(Math.round(evt.value * 10000)/100);
-
+
+
-        canvasZoomValue.text = String(Math.round((1.0 / (-evt.value + 2)) * 10000)/100);
-    }
-    // 20090905-haku2 ins end
-Canvas
+
-}
-// 20090909-haku2 upd start
@@ -311 +489 @@
-    if (rm <= 0) {
-        rm = 1;
-
+
+
-        rm /= 100;
-
+
+
-        rm = -(100 / rm) + 2;
-    }
-    canvasZoom.value = rm;
-Canvas
+
-}
-// 20090909-haku2 upd end
@@ -324 +504 @@
-{
-    canvasRotateValue.text = String(-evt.value); // 20090905-haku2 ins キャンバス回転角度をテキストボックスに反映
-Canvas
+
-}
-
@@ -332 +512 @@
-{
-    canvasRotate.value = Number(canvasRotateValue.text);
-Canvas
+
-}
-// 20090909-haku2 upd end
@@ -369 +549 @@
-
-// 20090906-haku2 ins end
-private function changeUndoRedoHandler(event:UndoEvent):void
-{
-    var undoCount:int = event.undoCount;
-    undoButton.label = 'アンドゥ ';
-    if (undoCount > 0) {
-        undoButton.label += '(' + undoCount + ')';
-        undoButton.enabled = true;
-    }
-    else {
-        undoButton.enabled = false;
-    }
-    var redoCount:int = event.redoCount;
-    redoButton.label = 'リドゥ ';
-    if (redoCount > 0) {
-        redoButton.label += '(' + redoCount + ')';
-        redoButton.enabled = true;
-    }
-    else {
-        redoButton.enabled = false;
-    }
-}
-
-private function commCompleteHandler(com:Com):void
@@ -415 +574 @@
-    if (titleTextInput.text == '') {
-        Alert.show('絵のタイトルが空です。', ALERT_TITLE);
-
-
-
+
+
-        Alert.show('書き込みが空です。', ALERT_TITLE);
-
-
-
-
+
+
-        Alert.show('絵が描かれていません。お絵かきしてください。', ALERT_TITLE);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-}
@@ -465 +622 @@
-    canvasRotate.value = v;
-    canvasRotateValue.text = String(-canvasRotate.value); // 20090909-haku2 ins キャンバス回転角度をテキストボックスに反映
-Canvas
+
-}
-
@@ -471 +628 @@
-{
-    canvasZoom.value = v;
-Canvas
+
-    // 20090909-haku2 ins start
-    // 拡大率をテキストボックスに反映
@@ -482 +639 @@
-}
-
-private function get isShortCut():Boolean
-{
-    return stage.focus is mx.core.UITextField;
-}
-
-private function shortCutKeyDownHandler(evt:KeyboardEvent):void
-{
-    if (isShortCut)
-        return;
-    switch (evt.keyCode) {
-        case Keyboard.CONTROL:
-            penDetailWindow.pen = DrawModuleFactory.DROPPER;
-            break;
-        case Keyboard.SHIFT:
-            break;
-        case Keyboard.SPACE:
-            penDetailWindow.pen = ""; // handtool
-            break;
-        case 48: // 0
-        case 96: // ten-key 0
-            if (evt.shiftKey) {
-                setRotate(0);
-            } else {
-                setZoom(1);
-            }
-            break;
-        case 65: // a
-            // Aキーの状態 = 押下中
-            m_module.keyA = true;
-            break;
-        case 73: // i
-            windowsResetButtonHandler(null);
-            break;
-        case 77: // m
-            m_module.horizontalMirror(0xff);
-            break;
-        case 81: // q
-            // Qキーの状態 = 押下中
-            m_module.keyQ = true;
-            break;
-        case 82: // r
-            // Rキーの状態 = 押下中
-            m_module.shouldStartAfterDrawing = true;
-            break;
-        // 20090905-haku2 ins start
-        case 84: // t
-            // Tキーの状態 = 押下中
-            m_module.shouldStartBeforeDrawing = true;
-            break;
-        // 20090905-haku2 ins end
-        case 89: // y
-            m_module.redo();
-            break;
-        case 90: // z
-            m_module.undo();
-            break;
-        case 107: // ten key +
-            // +
-            setZoom(canvasZoom.value + 1);
-            break;
-        case 109: // ten key -
-            // -
-            setZoom(canvasZoom.value - 1);
-            break;
-        case 187:
-            if (evt.shiftKey)
-                // +
-                setZoom(canvasZoom.value + 1);
-            break;
-        case 189:
-            // -
-            setZoom(canvasZoom.value - 1);
-            break;
-        case 49: // 1
-        case 50: // 2
-        case 51: // 3
-        case 52: // 4
-        case 53: // 5
-        case 54: // 6
-        case 55: // 7
-        case 56: // 8
-        case 57: // 9
-            if (!evt.shiftKey)// 念のため SHIFTキー対応 (テンキーのほうは放置)
-                penDetailWindow.thickness = evt.keyCode - 48;
-            break;
-        case 97: // ten-key 1
-        case 98: // ten-key 2
-        case 99: // ten-key 3
-        case 100: // ten-key 4
-        case 101: // ten-key 5
-        case 102: // ten-key 6
-        case 103: // ten-key 7
-        case 104: // ten-key 8
-        case 105: // ten-key 9
-            penDetailWindow.thickness = evt.keyCode - 96;
-            break;
-        case 45: // INS
-            if (!evt.shiftKey)
-                setRotate(0);
-            break;
-        default:
-            // Alert('' + evt.keyCode);
-            break;
-    }
-}
-
-private function shortCutKeyUpHandler(evt:KeyboardEvent):void
-{
-    if (isShortCut)
-        return;
-    switch (evt.keyCode) {
-        case Keyboard.CONTROL:
-            penDetailWindow.reset();
-            break;
-        case Keyboard.SPACE:
-            penDetailWindow.reset();
-            break;
-        case 65: // a
-            // Aキーの状態 = 解放
-            m_module.keyA = false;
-            break;
-        case 81: // q
-            // Qキーの状態 = 解放
-            m_module.keyQ = false;
-            break;
-        case 82: // r
-            // Rキーの状態 = 解放
-            m_module.shouldStartAfterDrawing = false;
-            break;
-        // 20090905-haku2 ins start
-        case 84: // t
-            // Tキーの状態 = 解放
-            m_module.shouldStartBeforeDrawing = false;
-            break;
-        // 20090905-haku2 ins end
-        return;
-    }
-}
-
-private function alertOnUnload(b:Boolean):void
-{

as3/gunyarapaint/branches/gunyarapaint/compat/src/gunyarapaint.mxml

@@ -4 +4 @@
-    xmlns:gpcontrol="org.libspark.gunyarapaint.controls.*"
-    layout="absolute" width="100%" height="100%"
-
-
-
+
+
+
+
-    borderStyle="solid" cornerRadius="0" borderColor="#333333"
-    backgroundGradientAlphas="[1.0, 1.0]" backgroundGradientColors="[#cccccc, #cccccc]"
-controls.IDelegate
+framework.ui.IApplication
-    alpha="1.0">
-    <mx:Script source="gunyarapaint.as">

as3/gunyarapaint/branches/gunyarapaint/compat/src/org/libspark/gunyarapaint/controls/GPCanvas.as

@@ -1 +1 @@
-package org.libspark.gunyarapaint.controls
-{
+    import flash.display.Sprite;
+    import flash.events.Event;
-    import flash.events.MouseEvent;
-    import flash.geom.Rectangle;
@@ -10 +12 @@
-    import org.libspark.gunyarapaint.framework.AuxPixelView;
-    import org.libspark.gunyarapaint.framework.TransparentBitmap;
+    import org.libspark.gunyarapaint.framework.ui.IApplication;
-    
-    internal class GPCanvas extends UIComponent
-    {
-
-
-
-
-
+
-        {
-delegate.canvasWidth, delegate
+application.canvasWidth, application
-            var transparent:TransparentBitmap = new TransparentBitmap(rect);
-            m_auxLine = new AuxLineView(rect);
-            m_auxPixel = new AuxPixelView(rect);
-delegate = delegate
+application = application
-            m_auxLine.visible = true;
-            m_auxPixel.visible = false;
-            
-            addChild(transparent);
-delegate
+application
-            addChild(m_auxLine);
-            addChild(m_auxPixel);
-
-
-
-
+
+
+
-            
-            super();
@@ -76 +74 @@
-        }
-        
-mouseDownHandler(evt:Mouse
+onRemove(event:
-        {
+            removeMouseEvents(m_application.canvasView);
+            removeEventListener(MouseEvent.MOUSE_DOWN, onMouseDown);
+            removeEventListener(MouseEvent.MOUSE_UP, onMouseUp);
+            removeEventListener(Event.REMOVED, onRemove);
+        }
+        
+        private function onMouseDown(event:MouseEvent):void
+        {
+            var cv:Sprite = m_application.canvasView;
-            try {
-
-
+
+
+
-            } catch (e:Error) {
+                removeMouseEvents(cv);
-                Alert.show(e.message, e.name);
-            }
-        }
-        
-mouseMoveHandler(ev
+onMouseMove(even
-        {
-delegate.module.move(evt.localX, ev
+application.module.move(event.localX, even
-        }
-        
-mouseUpHandler(ev
+onMouseUp(even
-        {
-m_delegate.canvasView.removeEventListener(MouseEvent.MOUSE_MOVE,mouseMoveHandler
-delegate.module.stop(evt.localX, ev
+removeMouseEvents(m_application.canvasView
+application.module.stop(event.localX, even
-        }
-        
-mouseOutHandler(ev
+onMouseOut(even
-        {
-
+
+
-        }
+        
+        private function removeMouseEvents(cv:Sprite):void
+        {
+            cv.removeEventListener(MouseEvent.MOUSE_MOVE, onMouseMove);
+            cv.removeEventListener(MouseEvent.MOUSE_OUT, onMouseOut);
+        }
+        
+        private var m_auxLine:AuxLineView;
+        private var m_auxPixel:AuxPixelView;
+        private var m_application:IApplication;
-    }
-}

as3/gunyarapaint/branches/gunyarapaint/compat/src/org/libspark/gunyarapaint/controls/GPCanvasWindowControl.as

@@ -18 +18 @@
-    import org.libspark.gunyarapaint.framework.AuxBitmap;
-    import org.libspark.gunyarapaint.framework.Pen;
+    import org.libspark.gunyarapaint.framework.ui.IApplication;
-    
-    public class GPCanvasWindowControl extends TitleWindow
@@ -52 +53 @@
-        }
-        
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-            var m:Matrix = transform.matrix;
-            m.translate(-p.x, -p.y);
-deg
+value
-            m.translate(p.x, p.y);
-            transform.matrix = m;
-deg
-deg
+value
+value
-                transform.matrix = new Matrix(1, 0, 0, 1, m.tx, m.ty);
-        }
-        
-Canvas
+
-        {
-            m_canvasX = x;
-            m_canvasY = y;
-moveCanvas
+update
-        }
-        
@@ -136 +136 @@
-            m_canvasScale = 1;
-            
-Delegate
+Application
-            m_canvasContainer.addChild(m_canvas);
-            m_contentContainer.addChild(m_canvasContainer);
@@ -143 +143 @@
-            m_resizable = new ResizableComponent(this, new Point(100, 100));
-            
-Container
-moveCanvas
+
+update
-            
-            addEventListener(ResizeEvent.RESIZE, onResize);
@@ -153 +153 @@
-        {
-            m_canvasX = m_hScrollBar.scrollPosition;
-moveCanvas
+update
-        }
-        
@@ -159 +159 @@
-        {
-            m_canvasY = m_vScrollBar.scrollPosition;
-moveCanvas
+update
-        }
-        
-        private function onResize(evt:ResizeEvent):void
-        {
-Container
-moveCanvas
+
+update
-        }
-        
@@ -171 +171 @@
-        {
-            if (e.eventPhase == flash.events.EventPhase.AT_TARGET) {
-Delegate
+Application
-                setStyle("backgroundColor", pen.color);
-                m_canvas.auxLineColor = pen.color;
@@ -179 +179 @@
-        }
-        
-moveCanvas
-
-delegate:IDelegate = IDelegate
-delegate
-delegate
+update
+
+application:IApplication = IApplication
+application
+application
-            m_canvasX = Math.floor(m_canvasX);
-            m_canvasY = Math.floor(m_canvasY);
@@ -207 +207 @@
-        }
-        
-Container
+
-        {
-            // 仮にサイズを狭める
@@ -221 +221 @@
-            m_vScrollBar.height = clientHeight;
-            
-delegate:IDelegate = IDelegate
-delegate
-delegate
+application:IApplication = IApplication
+application
+application
-            // TODO: minでいいやん
-            if (canvasWidth * m_canvasScale < clientWidth)

as3/gunyarapaint/branches/gunyarapaint/compat/src/org/libspark/gunyarapaint/controls/GPLayerWindowControl.mxml

@@ -18 +18 @@
-            import org.libspark.gunyarapaint.framework.Painter;
-            import org.libspark.gunyarapaint.utils.ComponentResizer;
-controls.IDelegate
+framework.ui.IApplication
-            
-            public function update():void
-            {
-Delegate
+Application
-                var layer:LayerBitmap = layers.at(layers.currentIndex);
-                var currentLayerBlendMode:String = layer.blendMode;
@@ -40 +40 @@
-            private function onCreateComplete():void
-            {
-delegate:IDelegate = IDelegate
-delegate
+application:IApplication = IApplication
+application
-                enabled = true;
-                update();
-                
-delegate
+application
-                var currentLayerIndex:uint = layers.currentIndex;
-                var currentLayerBlendMode:String = layers.at(currentLayerIndex).blendMode;
@@ -63 +63 @@
-            private function onClickLayer(evt:ListEvent):void
-            {
-delegate:IDelegate = IDelegate
+application:IApplication = IApplication
-                var layer:LayerBitmap = LayerBitmap(evt.currentTarget.selectedItem);
-delegate
-delegate
+application
+application
-            }
-            
-            private function onCreateLayer(evt:Event):void
-            {
-Delegate
+Application
-                update();
-            }
@@ -77 +77 @@
-            private function onCopyLayer(evt:Event):void
-            {
-Delegate
+Application
-                update();
-            }
@@ -84 +84 @@
-            {
-                try {
-Delegate
+Application
-                    update();
-                } catch (e:Error) {
@@ -94 +94 @@
-            {
-                try {
-Delegate
+Application
-                    update();
-                } catch (e:Error) {
@@ -108 +108 @@
-            private function onChangeAlphaSlider(evt:SliderEvent):void
-            {
-Delegate
+Application
-            }
-            
-            private function onSelectBlendMode(evt:ListEvent):void
-            {
-Delegate
+Application
-            }
-            
-            private function onDragComplete(evt:DragEvent):void
-            {
-delegate:IDelegate = IDelegate
+application:IApplication = IApplication
-                var a:Array = (layerDataGrid.dataProvider as ArrayCollection).toArray().reverse();
-                var length:uint = a.length;
-delegate
+application
-                for (var i:uint = 0; i < length; i++) {
-                    var from:uint = a[i].index;
-                    var to:uint = layers.at(i).index;
-                    if (a[i].index != to) {
-delegate
+application
-                        break;
-                    }

as3/gunyarapaint/branches/gunyarapaint/compat/src/org/libspark/gunyarapaint/controls/PenDetailWindowControl.mxml

@@ -11 +11 @@
-            
-            import org.libspark.gunyarapaint.framework.modules.DrawModuleFactory;
+            import org.libspark.gunyarapaint.framework.ui.IApplication;
-            
-            private var m_gridItemPalette:GridItem;
@@ -25 +26 @@
-                else if (eraserButton.selected) {
-                    pen = DrawModuleFactory.ERASER;
-Delegate
+Application
-                }
-                else if (dotButton.selected) {
@@ -32 +33 @@
-                else {
-                    pen = String(blendModeComboBox.value);
-Delegate
+Application
-                }
-            }
@@ -42 +43 @@
-                eraserButton.selected = false;
-                dotButton.selected = false;
-delegate:IDelegate = IDelegate
-delegate
+application:IApplication = IApplication
+application
-            }
-            
@@ -70 +71 @@
-            
-            /*
-delegate(value:IDelegate
+application(value:IApplication
-            {
-            penDetail.logger = l;
@@ -108 +109 @@
-                currentState = mode;
-                if (mode != "handtool")
-Delegate
+Application
-            }
-            
-            public function set thickness(t:uint):void
-            {
-Delegate
+Application
-            }
-            
-            private function onInitialize():void
-            {
-Delegate
+Application
-                onClickPalette(1);
-                // 初期値と設定値が一緒なのでイベントが飛んでこない、明示的に呼んであげる
@@ -134 +135 @@
-                palette.setStyle("borderColor", 0x000000);
-                m_gridItemPalette = palette;
-Delegate
+Application
-                setColorRGBSlider(m_gridItemPalette.getStyle("backgroundColor")); // 20090905-haku2 ins
-            }
@@ -170 +171 @@
-                else if (evt.type == Event.CHANGE) {
-                var color:uint = SColorPicker(evt.target).selectedColor;
-delegate
+application
-                m_gridItemPalette.setStyle("backgroundColor", color);
-                setColRGBSlider(color); // 20090905-haku2 ins
@@ -201 +202 @@
-                else {
-                    pen = DrawModuleFactory.ERASER;
-Delegate
+Application
-                }
-            }
@@ -216 +217 @@
-            {
-                cancel();
-delegate:IDelegate = IDelegate
-delegate
+application:IApplication = IApplication
+application
-            }
-            
@@ -223 +224 @@
-            {
-                cancel();
-Delegate
+Application
-            }
-            
-            private function onChangeThicknessSlider(evt:SliderEvent):void
-            {
-Delegate
+Application
-            }
-            
@@ -261 +262 @@
-                        break;
-                }
-Delegate
+Application
-                m_gridItemPalette.setStyle('backgroundColor', color);
-            }
@@ -267 +268 @@
-            private function onChangeAlphaSlider(evt:SliderEvent):void
-            {
-Delegate
+Application
-            }
-        ]]>