Merge pull request #73 from CSchank/bugfix

Necried · web-flow · commit a7e9ec2dd302 · 2019-03-07T20:30:08.000-05:00
Bugfix: left arrow to reset the tape
diff --git a/.travis.yml b/.travis.yml
@@ -29,4 +29,4 @@ jobs:
 stages:
 - test
 - name: deploy
-  if: "(branch = master) AND (type = push)"
+  if: "(branch = master) AND (tag IS present)"
diff --git a/elm.json b/elm.json
@@ -6,7 +6,7 @@
     "elm-version": "0.19.0",
     "dependencies": {
         "direct": {
-            "MacCASOutreach/graphicsvg": "6.1.0",
+            "MacCASOutreach/graphicsvg": "5.1.0",
             "billstclair/elm-sha256": "1.0.8",
             "elm/browser": "1.0.1",
             "elm/core": "1.0.2",
diff --git a/src/Building.elm b/src/Building.elm
@@ -1,6 +1,7 @@
 module Building exposing (Model, Msg(..), PersistentModel(..), editingButtons, init, initPModel, onEnter, onExit, subscriptions, update, updateArrowPos, updateStatePos, view)
 
 import Browser.Events
+import Debug
 import Dict exposing (Dict)
 import Environment exposing (Environment)
 import GraphicSVG exposing (..)
@@ -33,7 +34,7 @@ type Msg
     | SaveStateName StateID String
     | SaveTransitionName TransitionID String
     | AddState ( Float, Float )
-    | KeyPressed Int
+    | KeyPressed String
     | ToggleSnap
     | ChangeSnap Int
     | NoOp
@@ -42,7 +43,7 @@ type Msg
 subscriptions : Model -> Sub Msg
 subscriptions model =
     Sub.batch
-        [ Browser.Events.onKeyDown (D.map KeyPressed (D.field "keyCode" D.int))
+        [ Browser.Events.onKeyDown (D.map KeyPressed (D.field "key" D.string))
         ]
 
 
@@ -425,7 +426,7 @@ update env msg ( model, pModel, sModel ) =
                     ( ( { model | machineState = Regular }, pModel, sModel ), False, Cmd.none )
 
         KeyPressed k ->
-            if k == 13 then
+            if k == "Enter" then
                 --pressed enter
                 case model.machineState of
                     EditingStateLabel sId newLbl ->
@@ -463,8 +464,7 @@ update env msg ( model, pModel, sModel ) =
                     _ ->
                         ( ( model, pModel, sModel ), False, Cmd.none )
 
-            else if k == 68 then
-                --pressed delete
+            else if k == "d" then
                 case model.machineState of
                     SelectedState stId ->
                         let
@@ -526,14 +526,13 @@ update env msg ( model, pModel, sModel ) =
                     _ ->
                         ( ( model, pModel, sModel ), False, Cmd.none )
 
-            else if k == 71 then
-                --pressed G
+            else if k == "g" then
                 ( ( model, pModel, sModel ), False, sendMsg ToggleSnap )
 
             else
                 case model.machineState of
                     SelectedState sId ->
-                        if k == 70 then
+                        if k == "f" then
                             let
                                 newMachine =
                                     { oldMachine
diff --git a/src/Machine.elm b/src/Machine.elm
@@ -752,15 +752,18 @@ renderStates currentStates machine model env =
 
                         _ ->
                             group []
-                    , rect 25 18
-                        |> filled blank
                     ]
                     |> move (getPos sId)
-                    |> (if not env.holdingShift then
-                            notifyMouseDownAt (StartDragging sId)
+                    |> (case model of
+                            EditingStateLabel _ _ ->
+                                identity
 
-                        else
-                            notifyTap (TapState sId)
+                            _ ->
+                                if not env.holdingShift then
+                                    notifyMouseDownAt (StartDragging sId)
+
+                                else
+                                    notifyTap (TapState sId)
                        )
             )
             stateList
diff --git a/src/Main.elm b/src/Main.elm
@@ -31,8 +31,8 @@ type Msg
     = BMsg Building.Msg
     | SMsg Simulating.Msg
     | EMsg Exporting.Msg
-    | KeyPressed Int
-    | KeyReleased Int
+    | KeyPressed String
+    | KeyReleased String
     | WindowSize ( Int, Int )
     | UrlChange Url
     | UrlRequest UrlRequest
@@ -94,8 +94,8 @@ main =
             \model ->
                 Sub.batch
                     [ Browser.Events.onResize (\w h -> WindowSize ( w, h ))
-                    , Browser.Events.onKeyDown (D.map KeyPressed (D.field "keyCode" D.int))
-                    , Browser.Events.onKeyUp (D.map KeyReleased (D.field "keyCode" D.int))
+                    , Browser.Events.onKeyDown (D.map KeyPressed (D.field "key" D.string))
+                    , Browser.Events.onKeyUp (D.map KeyReleased (D.field "key" D.string))
                     , Browser.Events.onVisibilityChange VisibilityChanged
                     , case model.appModel.present.appState of
                         Building m ->
@@ -228,30 +228,30 @@ update msg model =
             ( model, Cmd.none )
 
         KeyReleased k ->
-            if k == 16 then
+            if k == "Shift" then
                 ( { model | environment = { oldEnvironment | holdingShift = False } }, Cmd.none )
 
-            else if k == 91 then
+            else if k == "Meta" then
                 ( { model | environment = { oldEnvironment | holdingMeta = False } }, Cmd.none )
 
-            else if k == 17 then
+            else if k == "Control" then
                 ( { model | environment = { oldEnvironment | holdingControl = False } }, Cmd.none )
 
             else
                 ( model, Cmd.none )
 
         KeyPressed k ->
-            if k == 16 then
+            if k == "Shift" then
                 ( { model | environment = { oldEnvironment | holdingShift = True } }, Cmd.none )
 
-            else if k == 89 {- y -} || k == 90 {- z -} then
+            else if k == "y" || k == "z" then
                 let
                     doUndo =
-                        (oldEnvironment.holdingControl || oldEnvironment.holdingMeta) && k == 90
+                        (oldEnvironment.holdingControl || oldEnvironment.holdingMeta) && k == "z"
 
                     doRedo =
-                        (oldEnvironment.holdingControl && k == 89)
-                            || (oldEnvironment.holdingMeta && oldEnvironment.holdingShift && k == 90)
+                        (oldEnvironment.holdingControl && k == "y")
+                            || (oldEnvironment.holdingMeta && oldEnvironment.holdingShift && k == "z")
                 in
                 ( { model
                     | appModel =
@@ -267,11 +267,11 @@ update msg model =
                 , Cmd.none
                 )
 
-            else if k == 91 then
+            else if k == "Meta" then
                 --pressed meta key
                 ( { model | environment = { oldEnvironment | holdingMeta = True } }, Cmd.none )
 
-            else if k == 17 then
+            else if k == "Control" then
                 --pressed control
                 ( { model | environment = { oldEnvironment | holdingControl = True } }, Cmd.none )
                 {- else if k == 66 then
diff --git a/src/Simulating.elm b/src/Simulating.elm
@@ -2,6 +2,7 @@ module Simulating exposing (HoverError, InputTape, Model(..), Msg(..), Persisten
 
 import Array exposing (Array)
 import Browser.Events
+import Debug
 import Dict exposing (Dict)
 import Environment exposing (Environment)
 import Error exposing (..)
@@ -17,7 +18,7 @@ import Tuple exposing (first, second)
 
 subscriptions : Model -> Sub Msg
 subscriptions model =
-    Browser.Events.onKeyDown (D.map KeyPressed (D.field "keyCode" D.int))
+    Browser.Events.onKeyDown (D.map KeyPressed (D.field "key" D.string))
 
 
 type alias PersistentModel =
@@ -51,7 +52,7 @@ type Msg
     | AddNewTape
     | ChangeTape Int
     | ToggleStart StateID
-    | KeyPressed Int
+    | KeyPressed String
     | ChangeMachine MachineType
     | MachineMsg Machine.Msg
     | HoverErrorEnter Int
@@ -166,7 +167,17 @@ renderTape model input tapeSt tapeId selectedId inputAt showButtons =
                         , latex (xpad * 0.9) (xpad * 0.7) "white" st AlignCentre
                             |> move ( 0, 10.25 )
                         ]
-                        |> move ( toFloat n * xpad, 0 )
+                        |> move
+                            ( toFloat n
+                                * xpad
+                                + (if not showButtons then
+                                    xpad / 2
+
+                                   else
+                                    0
+                                  )
+                            , 0
+                            )
                         |> notifyTap (ChangeTape tapeId)
                 )
                 input
@@ -325,17 +336,15 @@ update env msg ( model, pModel, sModel ) =
             ( ( Default tId -1 Nothing {- ??? -}, { pModel | currentStates = epsTrans oldMachine.transitionNames oldMachine.delta oldMachine.start }, sModel ), False, Cmd.none )
 
         KeyPressed k ->
-            if k == 13 then
-                --pressed enter
+            if k == "Enter" then
                 case model of
                     Editing tId ->
                         ( ( Default tId -1 Nothing, { pModel | currentStates = epsTrans oldMachine.transitionNames oldMachine.delta oldMachine.start }, sModel ), True, Cmd.none )
 
                     _ ->
                         ( ( model, pModel, sModel ), False, Cmd.none )
 
-            else if k == 8 then
-                --pressed delete
+            else if k == "Backspace" || k == "ArrowLeft" then
                 case model of
                     Editing tapeId ->
                         let
@@ -366,97 +375,104 @@ update env msg ( model, pModel, sModel ) =
                     _ ->
                         ( ( model, pModel, sModel ), False, Cmd.none )
 
-            else if k == 39 then
-                --right arrow key
+            else if k == "ArrowRight" then
                 case model of
                     Default _ _ _ ->
                         ( ( model, pModel, sModel ), False, Task.perform identity (Task.succeed <| Step) )
 
                     _ ->
                         ( ( model, pModel, sModel ), False, Cmd.none )
 
+            else if k == "ArrowLeft" then
+                case model of
+                    Default tId _ hErr ->
+                        ( ( Default tId -1 hErr, { pModel | currentStates = sModel.machine.start }, sModel ), False, Cmd.none )
+
+                    _ ->
+                        ( ( model, pModel, sModel ), False, Cmd.none )
+
             else
                 case model of
                     Editing tapeId ->
                         let
                             charCode =
                                 case k of
-                                    65 ->
+                                    "a" ->
                                         0
 
-                                    83 ->
+                                    "s" ->
                                         1
 
-                                    68 ->
+                                    "d" ->
                                         2
 
-                                    70 ->
+                                    "f" ->
                                         3
 
-                                    71 ->
+                                    "g" ->
                                         4
 
-                                    72 ->
+                                    "h" ->
                                         5
 
-                                    74 ->
+                                    "j" ->
                                         6
 
-                                    75 ->
+                                    "k" ->
                                         7
 
-                                    76 ->
+                                    "l" ->
                                         8
 
-                                    81 ->
+                                    "q" ->
                                         9
 
-                                    87 ->
+                                    "w" ->
                                         10
 
-                                    69 ->
+                                    "e" ->
                                         11
 
-                                    82 ->
+                                    "r" ->
                                         12
 
-                                    84 ->
+                                    "t" ->
                                         13
 
-                                    89 ->
+                                    "y" ->
                                         14
 
-                                    85 ->
+                                    "u" ->
                                         15
 
-                                    73 ->
+                                    "i" ->
                                         16
 
-                                    79 ->
+                                    "o" ->
                                         17
 
-                                    80 ->
+                                    "p" ->
                                         18
 
-                                    90 ->
+                                    "z" ->
                                         19
 
-                                    88 ->
+                                    "x" ->
                                         20
 
-                                    67 ->
+                                    "c" ->
                                         21
 
-                                    86 ->
+                                    "v" ->
                                         22
 
-                                    66 ->
+                                    "b" ->
                                         23
 
-                                    78 ->
+                                    "n" ->
                                         24
 
-                                    77 ->
+                                    "m" ->
                                         25
 
                                     _ ->

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@ module Simulating exposing (HoverError, InputTape, Model(..), Msg(..), Persisten`
`2`	`2`
`3`	`3`	`import Array exposing (Array)`
`4`	`4`	`import Browser.Events`
	`5`	`+import Debug`
`5`	`6`	`import Dict exposing (Dict)`
`6`	`7`	`import Environment exposing (Environment)`
`7`	`8`	`import Error exposing (..)`
`@@ -17,7 +18,7 @@ import Tuple exposing (first, second)`
`17`	`18`
`18`	`19`	`subscriptions : Model -> Sub Msg`
`19`	`20`	`subscriptions model =`
`20`		`- Browser.Events.onKeyDown (D.map KeyPressed (D.field "keyCode" D.int))`
	`21`	`+ Browser.Events.onKeyDown (D.map KeyPressed (D.field "key" D.string))`
`21`	`22`
`22`	`23`
`23`	`24`	`type alias PersistentModel =`
`@@ -51,7 +52,7 @@ type Msg`
`51`	`52`	`\| AddNewTape`
`52`	`53`	`\| ChangeTape Int`
`53`	`54`	`\| ToggleStart StateID`
`54`		`- \| KeyPressed Int`
	`55`	`+ \| KeyPressed String`
`55`	`56`	`\| ChangeMachine MachineType`
`56`	`57`	`\| MachineMsg Machine.Msg`
`57`	`58`	`\| HoverErrorEnter Int`
`@@ -166,7 +167,17 @@ renderTape model input tapeSt tapeId selectedId inputAt showButtons =`
`166`	`167`	`, latex (xpad * 0.9) (xpad * 0.7) "white" st AlignCentre`
`167`	`168`	`\|> move ( 0, 10.25 )`
`168`	`169`	`]`
`169`		`- \|> move ( toFloat n * xpad, 0 )`
	`170`	`+ \|> move`
	`171`	`+ ( toFloat n`
	`172`	`+ * xpad`
	`173`	`+ + (if not showButtons then`
	`174`	`+ xpad / 2`
	`175`	`+`
	`176`	`+ else`
	`177`	`+ 0`
	`178`	`+ )`
	`179`	`+ , 0`
	`180`	`+ )`
`170`	`181`	`\|> notifyTap (ChangeTape tapeId)`
`171`	`182`	`)`
`172`	`183`	`input`
`@@ -325,17 +336,15 @@ update env msg ( model, pModel, sModel ) =`
`325`	`336`	`( ( Default tId -1 Nothing {- ??? -}, { pModel \| currentStates = epsTrans oldMachine.transitionNames oldMachine.delta oldMachine.start }, sModel ), False, Cmd.none )`
`326`	`337`
`327`	`338`	`KeyPressed k ->`
`328`		`- if k == 13 then`
`329`		`- --pressed enter`
	`339`	`+ if k == "Enter" then`
`330`	`340`	`case model of`
`331`	`341`	`Editing tId ->`
`332`	`342`	`( ( Default tId -1 Nothing, { pModel \| currentStates = epsTrans oldMachine.transitionNames oldMachine.delta oldMachine.start }, sModel ), True, Cmd.none )`
`333`	`343`
`334`	`344`	`_ ->`
`335`	`345`	`( ( model, pModel, sModel ), False, Cmd.none )`
`336`	`346`
`337`		`- else if k == 8 then`
`338`		`- --pressed delete`
	`347`	`+ else if k == "Backspace" \|\| k == "ArrowLeft" then`
`339`	`348`	`case model of`
`340`	`349`	`Editing tapeId ->`
`341`	`350`	`let`
`@@ -366,97 +375,104 @@ update env msg ( model, pModel, sModel ) =`
`366`	`375`	`_ ->`
`367`	`376`	`( ( model, pModel, sModel ), False, Cmd.none )`
`368`	`377`
`369`		`- else if k == 39 then`
`370`		`- --right arrow key`
	`378`	`+ else if k == "ArrowRight" then`
`371`	`379`	`case model of`
`372`	`380`	`Default _ _ _ ->`
`373`	`381`	`( ( model, pModel, sModel ), False, Task.perform identity (Task.succeed <\| Step) )`
`374`	`382`
`375`	`383`	`_ ->`
`376`	`384`	`( ( model, pModel, sModel ), False, Cmd.none )`
`377`	`385`
	`386`	`+ else if k == "ArrowLeft" then`
	`387`	`+ case model of`
	`388`	`+ Default tId _ hErr ->`
	`389`	`+ ( ( Default tId -1 hErr, { pModel \| currentStates = sModel.machine.start }, sModel ), False, Cmd.none )`
	`390`	`+`
	`391`	`+ _ ->`
	`392`	`+ ( ( model, pModel, sModel ), False, Cmd.none )`
	`393`	`+`
`378`	`394`	`else`
`379`	`395`	`case model of`
`380`	`396`	`Editing tapeId ->`
`381`	`397`	`let`
`382`	`398`	`charCode =`
`383`	`399`	`case k of`
`384`		`- 65 ->`
	`400`	`+ "a" ->`
`385`	`401`	`0`
`386`	`402`
`387`		`- 83 ->`
	`403`	`+ "s" ->`
`388`	`404`	`1`
`389`	`405`
`390`		`- 68 ->`
	`406`	`+ "d" ->`
`391`	`407`	`2`
`392`	`408`
`393`		`- 70 ->`
	`409`	`+ "f" ->`
`394`	`410`	`3`
`395`	`411`
`396`		`- 71 ->`
	`412`	`+ "g" ->`
`397`	`413`	`4`
`398`	`414`
`399`		`- 72 ->`
	`415`	`+ "h" ->`
`400`	`416`	`5`
`401`	`417`
`402`		`- 74 ->`
	`418`	`+ "j" ->`
`403`	`419`	`6`
`404`	`420`
`405`		`- 75 ->`
	`421`	`+ "k" ->`
`406`	`422`	`7`
`407`	`423`
`408`		`- 76 ->`
	`424`	`+ "l" ->`
`409`	`425`	`8`
`410`	`426`
`411`		`- 81 ->`
	`427`	`+ "q" ->`
`412`	`428`	`9`
`413`	`429`
`414`		`- 87 ->`
	`430`	`+ "w" ->`
`415`	`431`	`10`
`416`	`432`
`417`		`- 69 ->`
	`433`	`+ "e" ->`
`418`	`434`	`11`
`419`	`435`
`420`		`- 82 ->`
	`436`	`+ "r" ->`
`421`	`437`	`12`
`422`	`438`
`423`		`- 84 ->`
	`439`	`+ "t" ->`
`424`	`440`	`13`
`425`	`441`
`426`		`- 89 ->`
	`442`	`+ "y" ->`
`427`	`443`	`14`
`428`	`444`
`429`		`- 85 ->`
	`445`	`+ "u" ->`
`430`	`446`	`15`
`431`	`447`
`432`		`- 73 ->`
	`448`	`+ "i" ->`
`433`	`449`	`16`
`434`	`450`
`435`		`- 79 ->`
	`451`	`+ "o" ->`
`436`	`452`	`17`
`437`	`453`
`438`		`- 80 ->`
	`454`	`+ "p" ->`
`439`	`455`	`18`
`440`	`456`
`441`		`- 90 ->`
	`457`	`+ "z" ->`
`442`	`458`	`19`
`443`	`459`
`444`		`- 88 ->`
	`460`	`+ "x" ->`
`445`	`461`	`20`
`446`	`462`
`447`		`- 67 ->`
	`463`	`+ "c" ->`
`448`	`464`	`21`
`449`	`465`
`450`		`- 86 ->`
	`466`	`+ "v" ->`
`451`	`467`	`22`
`452`	`468`
`453`		`- 66 ->`
	`469`	`+ "b" ->`
`454`	`470`	`23`
`455`	`471`
`456`		`- 78 ->`
	`472`	`+ "n" ->`
`457`	`473`	`24`
`458`	`474`
`459`		`- 77 ->`
	`475`	`+ "m" ->`
`460`	`476`	`25`
`461`	`477`
`462`	`478`	`_ ->`