From 91cd2b91f9a1c94cbd45099a2fec1240002d8b1e Mon Sep 17 00:00:00 2001 From: Adabriand Furtado Date: Thu, 17 Mar 2016 16:07:29 -0300 Subject: [PATCH] Atualizadas as opções da tela de configuração de plano. --- view/assets/js/tmpJSONParser.js | 22 ---------------------- view/hand/movimento/passo-1.html | 2 +- view/hand/plano/passo-1.html | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++-------------- view/img/circular/md/plano-baixo-esquerda.webm | Bin 0 -> 75404 bytes view/img/circular/md/plano-baixo-tras.webm | Bin 0 -> 75163 bytes view/img/circular/md/plano-cima-direita.webm | Bin 0 -> 76652 bytes view/img/circular/md/plano-cima-frente.webm | Bin 0 -> 76235 bytes view/img/circular/md/plano-direita-baixo.webm | Bin 0 -> 76541 bytes view/img/circular/md/plano-direita-cima.webm | Bin 47939 -> 0 bytes view/img/circular/md/plano-direita-tras.webm | Bin 0 -> 76088 bytes view/img/circular/md/plano-esquerda-cima.webm | Bin 47682 -> 0 bytes view/img/circular/md/plano-esquerda-frente.webm | Bin 0 -> 77405 bytes view/img/circular/md/plano-frente-baixo.webm | Bin 0 -> 75502 bytes view/img/circular/md/plano-frente-cima.webm | Bin 46061 -> 0 bytes view/img/circular/md/plano-frente-direita.webm | Bin 0 -> 75572 bytes view/img/circular/md/plano-frente-esquerda.webm | Bin 47665 -> 0 bytes view/img/circular/md/plano-tras-cima.webm | Bin 47739 -> 0 bytes view/img/circular/md/plano-tras-esquerda.webm | Bin 47391 -> 0 bytes view/img/circular/me/plano-baixo-esquerda.webm | Bin 0 -> 76187 bytes view/img/circular/me/plano-baixo-tras.webm | Bin 0 -> 76323 bytes view/img/circular/me/plano-cima-direita.webm | Bin 0 -> 77396 bytes view/img/circular/me/plano-cima-frente.webm | Bin 0 -> 77002 bytes view/img/circular/me/plano-direita-baixo.webm | Bin 0 -> 77225 bytes view/img/circular/me/plano-direita-tras.webm | Bin 0 -> 76331 bytes view/img/circular/me/plano-esquerda-cima.webm | Bin 47443 -> 0 bytes view/img/circular/me/plano-esquerda-frente.webm | Bin 0 -> 76774 bytes view/img/circular/me/plano-frente-baixo.webm | Bin 0 -> 77447 bytes view/img/circular/me/plano-frente-cima.webm | Bin 46460 -> 0 bytes view/img/circular/me/plano-frente-direita.webm | Bin 0 -> 76206 bytes view/img/circular/me/plano-frente-esquerda.webm | Bin 46983 -> 0 bytes view/img/circular/me/plano-tras-cima.webm | Bin 0 -> 76874 bytes view/img/circular/me/plano-tras-esquerda.webm | Bin 0 -> 76997 bytes view/img/mov/SEMICIRCULAR.webm | Bin 0 -> 27834 bytes view/img/semicircular/md/plano-baixo-esquerda.webm | Bin 0 -> 58282 bytes view/img/semicircular/md/plano-baixo-tras.webm | Bin 0 -> 57856 bytes view/img/semicircular/md/plano-cima-direita.webm | Bin 0 -> 55730 bytes view/img/semicircular/md/plano-cima-frente.webm | Bin 0 -> 56624 bytes view/img/semicircular/md/plano-direita-baixo.webm | Bin 0 -> 57203 bytes view/img/semicircular/md/plano-direita-cima.webm | Bin 28070 -> 0 bytes view/img/semicircular/md/plano-direita-tras.webm | Bin 0 -> 57509 bytes view/img/semicircular/md/plano-esquerda-cima.webm | Bin 27120 -> 0 bytes view/img/semicircular/md/plano-esquerda-frente.webm | Bin 0 -> 57617 bytes view/img/semicircular/md/plano-frente-baixo.webm | Bin 0 -> 57714 bytes view/img/semicircular/md/plano-frente-cima.webm | Bin 27768 -> 0 bytes view/img/semicircular/md/plano-frente-direita.webm | Bin 0 -> 56831 bytes view/img/semicircular/md/plano-frente-esquerda.webm | Bin 27890 -> 0 bytes view/img/semicircular/md/plano-tras-cima.webm | Bin 27347 -> 0 bytes view/img/semicircular/md/plano-tras-esquerda.webm | Bin 27225 -> 0 bytes view/img/semicircular/md/sentido-anti-horario.webm | Bin 28070 -> 0 bytes view/img/semicircular/md/sentido-horario.webm | Bin 27134 -> 0 bytes view/img/semicircular/me/plano-baixo-esquerda.webm | Bin 0 -> 59343 bytes view/img/semicircular/me/plano-baixo-tras.webm | Bin 0 -> 58457 bytes view/img/semicircular/me/plano-cima-direita.webm | Bin 0 -> 56464 bytes view/img/semicircular/me/plano-cima-frente.webm | Bin 0 -> 54831 bytes view/img/semicircular/me/plano-direita-baixo.webm | Bin 0 -> 58132 bytes view/img/semicircular/me/plano-direita-cima.webm | Bin 27834 -> 0 bytes view/img/semicircular/me/plano-direita-tras.webm | Bin 0 -> 56732 bytes view/img/semicircular/me/plano-esquerda-cima.webm | Bin 27731 -> 0 bytes view/img/semicircular/me/plano-esquerda-frente.webm | Bin 0 -> 57654 bytes view/img/semicircular/me/plano-frente-baixo.webm | Bin 0 -> 59156 bytes view/img/semicircular/me/plano-frente-cima.webm | Bin 28059 -> 0 bytes view/img/semicircular/me/plano-frente-direita.webm | Bin 0 -> 57266 bytes view/img/semicircular/me/plano-frente-esquerda.webm | Bin 27845 -> 0 bytes view/img/semicircular/me/plano-tras-cima.webm | Bin 27737 -> 0 bytes view/img/semicircular/me/plano-tras-esquerda.webm | Bin 27636 -> 0 bytes view/img/semicircular/me/sentido-anti-horario.webm | Bin 27834 -> 0 bytes view/img/semicircular/me/sentido-horario.webm | Bin 26646 -> 0 bytes 67 files changed, 51 insertions(+), 37 deletions(-) create mode 100644 view/img/circular/md/plano-baixo-esquerda.webm create mode 100644 view/img/circular/md/plano-baixo-tras.webm create mode 100644 view/img/circular/md/plano-cima-direita.webm create mode 100644 view/img/circular/md/plano-cima-frente.webm create mode 100644 view/img/circular/md/plano-direita-baixo.webm delete mode 100644 view/img/circular/md/plano-direita-cima.webm create mode 100644 view/img/circular/md/plano-direita-tras.webm create mode 100644 view/img/circular/md/plano-esquerda-frente.webm create mode 100644 view/img/circular/md/plano-frente-baixo.webm delete mode 100644 view/img/circular/md/plano-frente-cima.webm create mode 100644 view/img/circular/md/plano-frente-direita.webm delete mode 100644 view/img/circular/md/plano-frente-esquerda.webm create mode 100644 view/img/circular/me/plano-baixo-esquerda.webm create mode 100644 view/img/circular/me/plano-baixo-tras.webm create mode 100644 view/img/circular/me/plano-cima-direita.webm create mode 100644 view/img/circular/me/plano-cima-frente.webm create mode 100644 view/img/circular/me/plano-direita-baixo.webm create mode 100644 view/img/circular/me/plano-direita-tras.webm create mode 100644 view/img/circular/me/plano-esquerda-frente.webm create mode 100644 view/img/circular/me/plano-frente-baixo.webm delete mode 100644 view/img/circular/me/plano-frente-cima.webm create mode 100644 view/img/circular/me/plano-frente-direita.webm delete mode 100644 view/img/circular/me/plano-frente-esquerda.webm create mode 100644 view/img/circular/me/plano-tras-cima.webm create mode 100644 view/img/circular/me/plano-tras-esquerda.webm create mode 100644 view/img/mov/SEMICIRCULAR.webm create mode 100644 view/img/semicircular/md/plano-baixo-esquerda.webm create mode 100644 view/img/semicircular/md/plano-baixo-tras.webm create mode 100644 view/img/semicircular/md/plano-cima-direita.webm create mode 100644 view/img/semicircular/md/plano-cima-frente.webm create mode 100644 view/img/semicircular/md/plano-direita-baixo.webm delete mode 100644 view/img/semicircular/md/plano-direita-cima.webm create mode 100644 view/img/semicircular/md/plano-direita-tras.webm create mode 100644 view/img/semicircular/md/plano-esquerda-frente.webm create mode 100644 view/img/semicircular/md/plano-frente-baixo.webm delete mode 100644 view/img/semicircular/md/plano-frente-cima.webm create mode 100644 view/img/semicircular/md/plano-frente-direita.webm delete mode 100644 view/img/semicircular/md/plano-frente-esquerda.webm create mode 100644 view/img/semicircular/me/plano-baixo-esquerda.webm create mode 100644 view/img/semicircular/me/plano-baixo-tras.webm create mode 100644 view/img/semicircular/me/plano-cima-direita.webm create mode 100644 view/img/semicircular/me/plano-cima-frente.webm create mode 100644 view/img/semicircular/me/plano-direita-baixo.webm delete mode 100644 view/img/semicircular/me/plano-direita-cima.webm create mode 100644 view/img/semicircular/me/plano-direita-tras.webm create mode 100644 view/img/semicircular/me/plano-esquerda-frente.webm create mode 100644 view/img/semicircular/me/plano-frente-baixo.webm delete mode 100644 view/img/semicircular/me/plano-frente-cima.webm create mode 100644 view/img/semicircular/me/plano-frente-direita.webm delete mode 100644 view/img/semicircular/me/plano-frente-esquerda.webm diff --git a/view/assets/js/tmpJSONParser.js b/view/assets/js/tmpJSONParser.js index 70312c3..cdf8c93 100644 --- a/view/assets/js/tmpJSONParser.js +++ b/view/assets/js/tmpJSONParser.js @@ -99,25 +99,6 @@ } } - function _circularMovementParser(tmpJSON, movementName, hand) { - var parsedHand = _parseHand(hand); - _defaultMovementParser(tmpJSON, movementName, hand); - var movPlane = movement_parameter_json[parsedHand][movementName]['plano']; - if (movPlane.indexOf('direita') != -1 || movPlane.indexOf('tras') != -1) { - movPlane = movPlane.replace('direita', 'esquerda'); - movPlane = movPlane.replace('tras', 'frente'); - movement_parameter_json[parsedHand][movementName]['plano'] = movPlane; - movement_parameter_json[parsedHand][movementName]['lado_oposto'] = true; - } else { - movement_parameter_json[parsedHand][movementName]['lado_oposto'] = false; - } - - if (movPlane == 'frente-cima' || movPlane == 'tras-cima') { - movement_parameter_json[parsedHand][movementName]['sentido_inverso'] = - !movement_parameter_json[parsedHand][movementName]['sentido_inverso']; - } - } - function _parseTempMovementParameterJSON(tmpJSON, hand) { var movimentConfig = tmpJSON[hand]['movimento']; if (typeof movimentConfig == 'undefined') return; @@ -128,9 +109,6 @@ if (movementName == 'retilineo') { _retilinearMovementParser(tmpJSON, movementName, hand); - } else if (movementName == 'circular' || - movementName == 'semicircular') { - _circularMovementParser(tmpJSON, movementName, hand); } else { _defaultMovementParser(tmpJSON, movementName, hand); } diff --git a/view/hand/movimento/passo-1.html b/view/hand/movimento/passo-1.html index ecad309..0398585 100644 --- a/view/hand/movimento/passo-1.html +++ b/view/hand/movimento/passo-1.html @@ -20,7 +20,7 @@ class="box-panel-option selection-panel-option" autoplay loop> Circular -