From 3bab6ad9bc81e5ba01dbf83cf1645f0640cdf5e9 Mon Sep 17 00:00:00 2001 From: Adabriand Furtado Date: Sun, 28 Feb 2016 14:14:38 -0300 Subject: [PATCH] Grade de pontos de articulação atualizada e vídeos do movimento Circular. --- view/assets/css/articulation.css | 42 ++++++++++++++++++++++++------------------ view/assets/js/articulation.js | 6 ++++-- view/assets/js/dynamic-loading-engine.js | 10 +++++++++- view/assets/js/dynamic-selection-workflow.js | 7 +++---- view/assets/js/tmpJSONParser.js | 14 +++++++++++--- view/conf/selection-workflow-json | 3 +-- view/hand/articulacao-retilineo/passo-1.html | 247 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------- view/hand/articulacao-retilineo/passo-2.html | 96 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------- view/hand/articulacao-retilineo/passo-3.html | 248 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------- view/hand/articulacao-retilineo/passo-4.html | 99 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------- view/hand/articulacao/passo-1.html | 249 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------ view/hand/articulacao/passo-2.html | 96 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------- view/hand/lado_oposto/passo-1.html | 23 ----------------------- view/hand/movimento/passo-1.html | 2 +- view/hand/plano/passo-1.html | 17 ++++++++--------- view/hand/raio/passo-1.html | 6 +++--- view/hand/sentido_inverso/passo-1.html | 4 ++-- view/hand/timeline.html | 5 ----- view/hand/velocidade/passo-1.html | 6 +++--- view/img/circular/md/plano-esquerda-cima.webm | Bin 0 -> 47939 bytes view/img/circular/md/plano-frente-cima.webm | Bin 0 -> 46061 bytes view/img/circular/md/plano-frente-esquerda.webm | Bin 0 -> 47665 bytes view/img/circular/md/raio-grande.webm | Bin 0 -> 47939 bytes view/img/circular/md/raio-normal.webm | Bin 0 -> 39679 bytes view/img/circular/md/raio-pequeno.webm | Bin 0 -> 32501 bytes view/img/circular/md/sentido-anti-horario.webm | Bin 0 -> 47197 bytes view/img/circular/md/sentido-horario.webm | Bin 0 -> 47939 bytes view/img/circular/md/velocidade-lento.webm | Bin 0 -> 56006 bytes view/img/circular/md/velocidade-normal.webm | Bin 0 -> 47939 bytes view/img/circular/md/velocidade-rapido.webm | Bin 0 -> 40502 bytes view/img/circular/me/plano-esquerda-cima.webm | Bin 0 -> 47443 bytes view/img/circular/me/plano-frente-cima.webm | Bin 0 -> 46460 bytes view/img/circular/me/plano-frente-esquerda.webm | Bin 0 -> 46983 bytes view/img/circular/me/raio-grande.webm | Bin 0 -> 47443 bytes view/img/circular/me/raio-normal.webm | Bin 0 -> 39254 bytes view/img/circular/me/raio-pequeno.webm | Bin 0 -> 32125 bytes view/img/circular/me/sentido-anti-horario.webm | Bin 0 -> 47528 bytes view/img/circular/me/sentido-horario.webm | Bin 0 -> 47443 bytes view/img/circular/me/velocidade-lento.webm | Bin 0 -> 55352 bytes view/img/circular/me/velocidade-normal.webm | Bin 0 -> 47443 bytes view/img/circular/me/velocidade-rapido.webm | Bin 0 -> 39921 bytes view/img/mov/PONTUAL.webm | Bin 42844 -> 0 bytes view/img/mov/RETILINEO.webm | Bin 0 -> 70756 bytes 43 files changed, 788 insertions(+), 392 deletions(-) delete mode 100644 view/hand/lado_oposto/passo-1.html create mode 100644 view/img/circular/md/plano-esquerda-cima.webm create mode 100644 view/img/circular/md/plano-frente-cima.webm create mode 100644 view/img/circular/md/plano-frente-esquerda.webm create mode 100644 view/img/circular/md/raio-grande.webm create mode 100644 view/img/circular/md/raio-normal.webm create mode 100644 view/img/circular/md/raio-pequeno.webm create mode 100644 view/img/circular/md/sentido-anti-horario.webm create mode 100644 view/img/circular/md/sentido-horario.webm create mode 100644 view/img/circular/md/velocidade-lento.webm create mode 100644 view/img/circular/md/velocidade-normal.webm create mode 100644 view/img/circular/md/velocidade-rapido.webm create mode 100644 view/img/circular/me/plano-esquerda-cima.webm create mode 100644 view/img/circular/me/plano-frente-cima.webm create mode 100644 view/img/circular/me/plano-frente-esquerda.webm create mode 100644 view/img/circular/me/raio-grande.webm create mode 100644 view/img/circular/me/raio-normal.webm create mode 100644 view/img/circular/me/raio-pequeno.webm create mode 100644 view/img/circular/me/sentido-anti-horario.webm create mode 100644 view/img/circular/me/sentido-horario.webm create mode 100644 view/img/circular/me/velocidade-lento.webm create mode 100644 view/img/circular/me/velocidade-normal.webm create mode 100644 view/img/circular/me/velocidade-rapido.webm create mode 100644 view/img/mov/RETILINEO.webm diff --git a/view/assets/css/articulation.css b/view/assets/css/articulation.css index 2eab074..ee55179 100644 --- a/view/assets/css/articulation.css +++ b/view/assets/css/articulation.css @@ -5,14 +5,14 @@ min-height: 361px } -.right-hand-gray-front-avatar { +.selection-panel-body[mainConfig=right-hand] .gray-front-avatar { background-image: url(../../img/pa/gray-front-avatar.png), url(../../img/pa/default-base.png); - background-position: 100px 15px, 0 0; + background-position: 105px 15px, 0 0; } -.left-hand-gray-front-avatar { +.selection-panel-body[mainConfig=left-hand] .gray-front-avatar { background-image: url(../../img/pa/gray-front-avatar.png), url(../../img/pa/default-base.png); - background-position: 5px 15px, 0 0; + background-position: 2px 15px, 0 0; } .gray-side-avatar { @@ -36,12 +36,21 @@ width: 315px; height: 361px; margin: 5%; + margin-left: 3%; z-index: 10 } -.grid .grid-selectors .grid-row { - height: 20%; - padding-top: 10%; +.selection-panel-body[mainConfig=right-hand] .grid .grid-selectors .grid-row { + height: 10%; + padding-top: 4%; + text-align: justify; + z-index: 20 +} + +.selection-panel-body[mainConfig=left-hand] .grid .grid-selectors .grid-row { + height: 10%; + padding-top: 4%; + margin-left: 13%; text-align: justify; z-index: 20 } @@ -50,16 +59,11 @@ background-color: #A0D0E8; border-radius: 50%; z-index: 100; - width: 13px; - height: 13px; + width: 10px; + height: 10px; display: inline-block; - margin-right: 6%; - margin-bottom: 13%; - float: left -} - -.grid .grid-selectors .grid-row .ball-selector:nth-last-of-type(1) { - margin-right: 0 + margin-right: 3.3%; + float: left; } .grid .grid-selectors .grid-row .ball-selector .point-selector { @@ -89,9 +93,11 @@ margin-top: 15px } -.module-z .grid-selectors .grid-row { +.selection-panel-body[mainConfig=right-hand] .module-z .grid-selectors .grid-row, +.selection-panel-body[mainConfig=left-hand] .module-z .grid-selectors .grid-row { margin-right: 58%; - padding-top: 3%; + padding-top: 0%; + height: 8% } .module-z .grid-selectors .grid-row .ball-selector { diff --git a/view/assets/js/articulation.js b/view/assets/js/articulation.js index bf01a81..57caaa7 100644 --- a/view/assets/js/articulation.js +++ b/view/assets/js/articulation.js @@ -1,6 +1,7 @@ (function(articulation, $, undefined) { var server_host = ''; + var MAX_COLUMNS = 14; function _updateASelector(container, ballSelector, step) { var pointSelector = parseInt(step) == 2 ? "A" : "B"; @@ -83,9 +84,10 @@ var y = yValue; var z = zValue; if (hand == 'left-hand') { - x = 10 - x + 1; + x = MAX_COLUMNS - x + 1; } - var value = (z - 1) * 10 + x + 30 * (y - 1); + + var value = (z - 1) * MAX_COLUMNS + x + 3 * MAX_COLUMNS * (y - 1); //console.log(value); return value; } diff --git a/view/assets/js/dynamic-loading-engine.js b/view/assets/js/dynamic-loading-engine.js index b0e66ed..8120b8e 100644 --- a/view/assets/js/dynamic-loading-engine.js +++ b/view/assets/js/dynamic-loading-engine.js @@ -26,6 +26,14 @@ } } + var replaceHandFolderTag = function(data, mainConfig) { + if (isRightHand(mainConfig)) { + return data.replace(/{{ hand-folder }}/g, 'md'); + } else { + return data.replace(/{{ hand-folder }}/g, 'me'); + } + } + if (matchSubConfig) { // case defined // There is no specific(right or left hand dependent) assets for: articulacao, duracao, expressao, movimento, transicao // Specific configurations: configuracao, orientacao @@ -50,7 +58,7 @@ console.log('No subConfig found'); } } - // change {{ hand }} + goodData = replaceHandFolderTag(goodData, currentMainConfig); goodData = goodData.replace(/{{ hand }}/g, currentMainConfig); return goodData.replace(/{{ server }}/g, url); }; diff --git a/view/assets/js/dynamic-selection-workflow.js b/view/assets/js/dynamic-selection-workflow.js index 83bce20..8f413ad 100644 --- a/view/assets/js/dynamic-selection-workflow.js +++ b/view/assets/js/dynamic-selection-workflow.js @@ -101,10 +101,9 @@ } function _selectSubConfig(subConfig) { - /*if (subConfig != 'movimento' && - currentSubConfigName == 'movimento') { - _updateAndGetFirstMovementSubConfig(); - }*/ + if (subConfig == 'movimento') { + _updateAndGetMovementConfig(); + } currentSubConfigName = subConfig; currentSubconfig = currentSubconfigParent[currentSubConfigName]; currentStep = 0; diff --git a/view/assets/js/tmpJSONParser.js b/view/assets/js/tmpJSONParser.js index 6af2687..7efde07 100644 --- a/view/assets/js/tmpJSONParser.js +++ b/view/assets/js/tmpJSONParser.js @@ -89,15 +89,21 @@ initParameterValue = tmpJSON[hand][attr][0]; endParameterValue = tmpJSON[hand][attr][1]; } - attr = attr.replace("-retilineo", ""); - var initAttr = attr + "_inicial"; - var endAttr = attr + "_final"; + attr = attr.replace('-retilineo', ''); + var initAttr = attr + '_inicial'; + var endAttr = attr + '_final'; movement_parameter_json[parsedHand][movementName][initAttr] = _parseParameterValue(initParameterValue); movement_parameter_json[parsedHand][movementName][endAttr] = _parseParameterValue(endParameterValue); } } + + function _circularMovementParser(tmpJSON, movementName, hand) { + var parsedHand = _parseHand(hand); + _defaultMovementParser(tmpJSON, movementName, hand); + movement_parameter_json[parsedHand][movementName]['lado_oposto'] = false; + } function _parseTempMovementParameterJSON(tmpJSON, hand) { var movimentConfig = tmpJSON[hand]['movimento']; @@ -109,6 +115,8 @@ if (movementName == 'retilineo') { _retilinearMovementParser(tmpJSON, movementName, hand); + } else if (movementName == 'circular') { + _circularMovementParser(tmpJSON, movementName, hand); } else { _defaultMovementParser(tmpJSON, movementName, hand); } diff --git a/view/conf/selection-workflow-json b/view/conf/selection-workflow-json index 9e628d2..9e860dd 100644 --- a/view/conf/selection-workflow-json +++ b/view/conf/selection-workflow-json @@ -18,8 +18,7 @@ "plano": ["passo-1"], "raio" : ["passo-1"], "velocidade" : ["passo-1"], - "sentido_inverso" : ["passo-1"], - "lado_oposto" : ["passo-1"] + "sentido_inverso" : ["passo-1"] }, "retilineo" : { "articulacao-retilineo": ["passo-1", "passo-2", "passo-3", "passo-4"], diff --git a/view/hand/articulacao-retilineo/passo-1.html b/view/hand/articulacao-retilineo/passo-1.html index 7fd337b..1b79a4f 100644 --- a/view/hand/articulacao-retilineo/passo-1.html +++ b/view/hand/articulacao-retilineo/passo-1.html @@ -1,74 +1,179 @@ -
-
- Ponto inicial (A): onde começa o sinal? -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ Ponto inicial + (A): onde começa o sinal? +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/view/hand/articulacao/passo-1.html b/view/hand/articulacao/passo-1.html index 4f5b7d9..5341222 100644 --- a/view/hand/articulacao/passo-1.html +++ b/view/hand/articulacao/passo-1.html @@ -1,75 +1,180 @@ -
-
- Onde é feito o sinal? -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ Onde é feito o sinal? +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/view/hand/articulacao/passo-2.html b/view/hand/articulacao/passo-2.html index eaa315b..8c01a66 100644 --- a/view/hand/articulacao/passo-2.html +++ b/view/hand/articulacao/passo-2.html @@ -1,37 +1,65 @@ -
-
- Escolha a distância entre a mão e o corpo -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ Escolha a distância entre a mão e o corpo +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/view/hand/lado_oposto/passo-1.html b/view/hand/lado_oposto/passo-1.html deleted file mode 100644 index 877c8b0..0000000 --- a/view/hand/lado_oposto/passo-1.html +++ /dev/null @@ -1,23 +0,0 @@ -
-
- O movimento começa pelo lado oposto? -
-
-
    -
  • Não
    • -
  • Sim
    • -
-
-
- diff --git a/view/hand/movimento/passo-1.html b/view/hand/movimento/passo-1.html index 14a2100..c3107ff 100644 --- a/view/hand/movimento/passo-1.html +++ b/view/hand/movimento/passo-1.html @@ -10,7 +10,7 @@ class="box-panel-option selection-panel-option" autoplay loop> Pontual -
      • -
      • +
    • Frente - Esquerda
      • -
      • -
    • Esquerda - Cima
      • + Frente - Cima
    diff --git a/view/hand/raio/passo-1.html b/view/hand/raio/passo-1.html index b808a39..681b429 100644 --- a/view/hand/raio/passo-1.html +++ b/view/hand/raio/passo-1.html @@ -5,17 +5,17 @@
    - -
    - -
    diff --git a/view/hand/velocidade/passo-1.html b/view/hand/velocidade/passo-1.html index f82a995..ba835fa 100644 --- a/view/hand/velocidade/passo-1.html +++ b/view/hand/velocidade/passo-1.html @@ -5,17 +5,17 @@