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

コミット日時:

2010/03/14 20:25:52 (3 年前)

コミッタ:

hkrn

ログメッセージ:

refactoring at zoom and rotate

ファイル:

• as3/gunyarapaint/branches/gunyarapaint/compat/src/gunyarapaint.as (更新) (9 diffs)
• as3/gunyarapaint/branches/gunyarapaint/compat/src/gunyarapaint.mxml (更新) (1 diff)

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

@@ -61 +61 @@
-    m_module = m_context.getModule(value);
-    if (m_module == null)
-
+
+
-}
-
@@ -145 +146 @@
-private function onCommit(event:CommandEvent):void
-{
-//
+
-    m_commit++;
-}
@@ -281 +282 @@
-            break;
-        case Keyboard.SPACE:
-""; // handtool
+MovingCanvasModule.MOVING_CANVAS;
-            break;
-        case 48: // 0
@@ -296 +297 @@
-            break;
-        case 73: // i
-windowsResetButtonHandler(null
+resetWindowsPosition(
-            break;
-        case 77: // m
@@ -404 +405 @@
-}
-
-windowsResetButtonHandler(evt:FlexEvent
+resetWindowsPosition(
-{
-    gpCanvasWindow.rotate(0);
-    
-    gpCanvasWindow.transform.matrix = new Matrix(1, 0, 0, 1, initCanvasWindowPos.x, initCanvasWindowPos.y);
-    penDetailWindow.move(initPenDetailWindowPos.x, initPenDetailWindowPos.y);
@@ -413 +413 @@
-    gpCanvasWindow.width = initCanvasWindowSize.x;
-    gpCanvasWindow.height = initCanvasWindowSize.y;
-    
-    setRotate(0);
-    setZoom(1);
+}
+
+// 数値入力で拡大率指定
+private function onChangeCanvasZoom(evt:Event):void
+{
+    var value:Number = Number(canvasZoomValue.text);
+    if (value <= 0) {
+        value = 1;
+    }
+    else if (value >= 100) {
+        value /= 100;
+    }
+    else {
+        value = -(100 / value) + 2;
+    }
+    setZoom(value);
+}
+
+// 数値入力でキャンバス回転角度指定
+private function onChangeCanvasRotate(evt:Event):void
+{
+    setRotate(Number(canvasRotateValue.text));
+}
+
+private function setRotate(value:Number):void
+{
+    canvasRotate.value = value;
+    canvasRotateValue.text = String(-canvasRotate.value); // 20090909-haku2 ins キャンバス回転角度をテキストボックスに反映
+    gpCanvasWindow.rotate(canvasRotate.value);
+}
+
+private function setZoom(value:Number):void
+{
+    var n:Number = value;
+    if (n < 1)
+        n = 1.0 / (-value + 2);
+    n *= 10000;
+    canvasZoom.value = value;
+    gpCanvasWindow.zoom(value);  
+    // 拡大率をテキストボックスに反映
+    canvasZoomValue.text = String(Math.round(n) / 100);
+}
+
+private function onChangeAuxDivideCount(evt:NumericStepperEvent):void
+{
+    gpCanvasWindow.auxDivideCount = uint(evt.value);
+}
+
+private function onChangeAuxBoxVisible(evt:Event):void
+{
+    gpCanvasWindow.auxBoxVisible = evt.target.selected;
+}
+
+private function onChangeAuxSkewVisible(evt:Event):void
+{
+    gpCanvasWindow.auxSkewVisible = evt.target.selected;
+}
+
+// 20090906-haku2 ins start
+// 補助線種類の変更
+private function onChangeAuxType(evt:ListEvent):void
+{
+    var n:Number = additionalNumberStepper.value;
+    if (evt.currentTarget.value == 0) {
+        additionalNumberStepper.minimum = 2;
+        additionalNumberStepper.maximum = 16;
+        gpCanvasWindow.enableAuxPixel = false;
+    }
+    else {
+        additionalNumberStepper.minimum = 4;
+        additionalNumberStepper.maximum = 80;
+        gpCanvasWindow.enableAuxPixel = true;
+    }
-}
-
@@ -468 +540 @@
-    /*
-    _logger = GPLogger.createForDraw(width, height, undoBufferSize,
-    
+
-    gpCanvasWindow.logger = _logger;
-    */
@@ -474 +546 @@
-    enabled = true;  
-}
-
-private function canvasZoomHandler(evt:SliderEvent):void
-{
-    // 20090905-haku2 ins start
-    // 拡大率をテキストボックスに反映
-    if (evt.value >= 1) {
-        canvasZoomValue.text = String(Math.round(evt.value * 10000)/100);
-    }
-    else {
-        canvasZoomValue.text = String(Math.round((1.0 / (-evt.value + 2)) * 10000)/100);
-    }
-    // 20090905-haku2 ins end
-    gpCanvasWindow.zoom(evt.value);
-}
-// 20090909-haku2 upd start
-
-// 数値入力で拡大率指定
-private function canvasZoomValueHandler(evt:Event):void
-{
-    var rm:Number = Number(canvasZoomValue.text);
-    if (rm <= 0) {
-        rm = 1;
-    }
-    else if (rm >= 100) {
-        rm /= 100;
-    }
-    else {
-        rm = -(100 / rm) + 2;
-    }
-    canvasZoom.value = rm;
-    gpCanvasWindow.zoom(canvasZoom.value);
-}
-// 20090909-haku2 upd end
-
-private function canvasRotateHandler(evt:SliderEvent):void
-{
-    canvasRotateValue.text = String(-evt.value); // 20090905-haku2 ins キャンバス回転角度をテキストボックスに反映
-    gpCanvasWindow.rotate(evt.value);
-}
-
-// 20090909-haku2 upd start
-// 数値入力でキャンバス回転角度指定
-private function canvasRotateValueHandler(evt:Event):void
-{
-    canvasRotate.value = Number(canvasRotateValue.text);
-    gpCanvasWindow.rotate(canvasRotate.value);
-}
-// 20090909-haku2 upd end
-
-private function additionalNumberStepperHandler(evt:NumericStepperEvent):void
-{
-    gpCanvasWindow.auxDivideCount = uint(evt.value);
-}
-
-private function additionalBoxCheckBoxHandler(evt:Event):void
-{
-    gpCanvasWindow.auxBoxVisible = evt.target.selected;
-}
-
-private function additionalSkewCheckBoxHandler(evt:Event):void
-{
-    gpCanvasWindow.auxSkewVisible = evt.target.selected;
-}
-
-// 20090906-haku2 ins start
-// 補助線種類の変更
-private function additionalTypeComboBoxHandler(evt:ListEvent):void
-{
-    var n:Number = additionalNumberStepper.value;
-    if (evt.currentTarget.value == 0) {
-        additionalNumberStepper.minimum = 2;
-        additionalNumberStepper.maximum = 16;
-        gpCanvasWindow.enableAuxPixel = false;
-    }
-    else {
-        additionalNumberStepper.minimum = 4;
-        additionalNumberStepper.maximum = 80;
-        gpCanvasWindow.enableAuxPixel = true;
-    }
-}
-
-// 20090906-haku2 ins end
-
-private function commCompleteHandler(com:Com):void
@@ -613 +603 @@
-}
-
-private function rotateResetButtonHandler(evt:Event):void
-{
-    setRotate(0);
-    canvasRotateValue.text = "0"; // 20090905-haku2 ins 数値入力をリセット
-}
-
-private function zoomResetButtonHandler(evt:Event):void
-{
-    setZoom(1);
-    canvasZoomValue.text = "100"; // 20090905-haku2 ins 数値入力をリセット
-}
-
-private function setRotate(v:Number):void
-{
-    canvasRotate.value = v;
-    canvasRotateValue.text = String(-canvasRotate.value); // 20090909-haku2 ins キャンバス回転角度をテキストボックスに反映
-    gpCanvasWindow.rotate(canvasRotate.value);
-}
-
-private function setZoom(v:Number):void
-{
-    canvasZoom.value = v;
-    gpCanvasWindow.zoom(canvasZoom.value);  
-    // 20090909-haku2 ins start
-    // 拡大率をテキストボックスに反映
-    if (canvasZoom.value >= 1) {
-        canvasZoomValue.text = String(Math.round(canvasZoom.value * 10000)/100);
-    } else {
-        canvasZoomValue.text = String(Math.round((1.0 / (-canvasZoom.value + 2)) * 10000)/100);
-    }
-    // 20090909-haku2 ins end
-}
-
-private function alertOnUnload(b:Boolean):void
-{

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

@@ -38 +38 @@
-            <mx:text></mx:text>
-        </mx:TextArea>
-rotateResetButtonHandler(event
-zoomResetButtonHandler(event
+setRotate(0
+setZoom(1
-        <mx:Button id="horizontalMirrorButton" x="117" y="128" label="全レイヤー左右反転" width="120" paddingLeft="0" paddingRight="0" paddingTop="0" paddingBottom="0" height="17" buttonDown="module.horizontalMirror(0xff)"/>
-        <mx:Button id="verticalMirrorButton" x="245" y="128" label="全レイヤー上下反転" width="120" paddingLeft="0" paddingRight="0" paddingTop="0" paddingBottom="0" height="17" buttonDown="module.verticalMirror(0xff)"/>
-canvasRotateHandler(event)" thumbDrag="canvasRotateHandler(event
-canvasZoomHandler(event)" thumbDrag="canvasZoomHandler(event
-canvasRotateValueHandler
+setRotate(event.value)" thumbDrag="setRotate(event.value
+setZoom(event.value)" thumbDrag="setZoom(event.value
+onChangeCanvasRotate
-        <mx:Label y="66" text="°" right="0"/>
-canvasZoomValueHandler
+onChangeCanvasZoom
-        <mx:Label y="83" text="%" right="0"/>
-        
-        <mx:Label y="4" text="補助線" right="199"/>
-additionalNumberStepperHandler
-additionalBoxCheckBoxHandler
-additionalSkewCheckBoxHandler
+onChangeAuxDivideCount
+onChangeAuxBoxVisible
+onChangeAuxSkewVisible
-        <mx:Button id="postOekakiButton" x="353" y="7" label="お絵カキコする！" fillAlphas="[1.0, 1.0, 1.0, 1.0]" fillColors="[#FFFFFF, #FF9999, #FFFFFF, #FFCCCC]" enabled="false" buttonDown="postOekakiButtonHandler(event)"/>
-        <mx:Button id="undoButton" y="38" label="アンドゥ" enabled="false" paddingLeft="3" paddingRight="3" right="89" buttonDown="m_recorder.undo()"/>
-        <mx:Button id="redoButton" y="38" label="リドゥ" enabled="false" paddingLeft="3" paddingRight="3" right="12" buttonDown="m_recorder.redo()"/>
-windowsResetButtonHandler(event
+resetWindowsPosition(
-        <mx:Button id="passwordButton" x="373" y="128" label="ふっかつのじゅもん" width="99" paddingLeft="0" paddingRight="0" paddingTop="0" paddingBottom="0" height="17" enabled="false" buttonDown="passwordButtonHandler(event)"/>
-        <mx:Button id="logPlayButton" y="105" label="ログプレイ" visible="false" right="99"/>
-        <mx:Button id="checkPngButton" y="105" label="同一check" visible="false" right="10"/>
-additionalTypeComboBoxHandler
+onChangeAuxType
-            <mx:ArrayCollection id="auxTypes">
-                <mx:Object label="分割" data="0" />