Commit 91cd2b91f9a1c94cbd45099a2fec1240002d8b1e

Authored by Adabriand Furtado
1 parent adda3f9a
Exists in master and in 1 other branch dynamic

Atualizadas as opções da tela de configuração de plano.

Showing 67 changed files with 51 additions and 37 deletions   Show diff stats
view/assets/js/tmpJSONParser.js
@@ -99,25 +99,6 @@ @@ -99,25 +99,6 @@
99 } 99 }
100 } 100 }
101 101
102 - function _circularMovementParser(tmpJSON, movementName, hand) {  
103 - var parsedHand = _parseHand(hand);  
104 - _defaultMovementParser(tmpJSON, movementName, hand);  
105 - var movPlane = movement_parameter_json[parsedHand][movementName]['plano'];  
106 - if (movPlane.indexOf('direita') != -1 || movPlane.indexOf('tras') != -1) {  
107 - movPlane = movPlane.replace('direita', 'esquerda');  
108 - movPlane = movPlane.replace('tras', 'frente');  
109 - movement_parameter_json[parsedHand][movementName]['plano'] = movPlane;  
110 - movement_parameter_json[parsedHand][movementName]['lado_oposto'] = true;  
111 - } else {  
112 - movement_parameter_json[parsedHand][movementName]['lado_oposto'] = false;  
113 - }  
114 -  
115 - if (movPlane == 'frente-cima' || movPlane == 'tras-cima') {  
116 - movement_parameter_json[parsedHand][movementName]['sentido_inverso'] =  
117 - !movement_parameter_json[parsedHand][movementName]['sentido_inverso'];  
118 - }  
119 - }  
120 -  
121 function _parseTempMovementParameterJSON(tmpJSON, hand) { 102 function _parseTempMovementParameterJSON(tmpJSON, hand) {
122 var movimentConfig = tmpJSON[hand]['movimento']; 103 var movimentConfig = tmpJSON[hand]['movimento'];
123 if (typeof movimentConfig == 'undefined') return; 104 if (typeof movimentConfig == 'undefined') return;
@@ -128,9 +109,6 @@ @@ -128,9 +109,6 @@
128 109
129 if (movementName == 'retilineo') { 110 if (movementName == 'retilineo') {
130 _retilinearMovementParser(tmpJSON, movementName, hand); 111 _retilinearMovementParser(tmpJSON, movementName, hand);
131 - } else if (movementName == 'circular' ||  
132 - movementName == 'semicircular') {  
133 - _circularMovementParser(tmpJSON, movementName, hand);  
134 } else { 112 } else {
135 _defaultMovementParser(tmpJSON, movementName, hand); 113 _defaultMovementParser(tmpJSON, movementName, hand);
136 } 114 }
view/hand/movimento/passo-1.html
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 class="box-panel-option selection-panel-option" autoplay loop> 20 class="box-panel-option selection-panel-option" autoplay loop>
21 <source type="video/webm"> 21 <source type="video/webm">
22 </video> Circular</li> 22 </video> Circular</li>
23 - <li><video src="{{ server }}/img/mov/CIRCULAR.webm" 23 + <li><video src="{{ server }}/img/mov/SEMICIRCULAR.webm"
24 preload="metadata" value="semicircular" 24 preload="metadata" value="semicircular"
25 class="box-panel-option selection-panel-option" autoplay loop> 25 class="box-panel-option selection-panel-option" autoplay loop>
26 <source type="video/webm"> 26 <source type="video/webm">
view/hand/plano/passo-1.html
@@ -6,45 +6,81 @@ @@ -6,45 +6,81 @@
6 <div class="selection-panel-inner-body"> 6 <div class="selection-panel-inner-body">
7 <ul class="rig columns-2"> 7 <ul class="rig columns-2">
8 <li><video 8 <li><video
9 - src="{{ server }}/img/{{ movement-name }}/{{ hand-folder }}/plano-esquerda-cima.webm"  
10 - preload="metadata" value="direita-cima" 9 + src="{{ server }}/img/{{ movement-name }}/{{ hand-folder }}/plano-baixo-esquerda.webm"
  10 + preload="metadata" value="baixo-esquerda"
  11 + class="box-panel-option selection-panel-option" autoplay>
  12 + <source type="video/webm">
  13 + </video>Baixo - Direita</li>
  14 + <li><video
  15 + src="{{ server }}/img/{{ movement-name }}/{{ hand-folder }}/plano-cima-direita.webm"
  16 + preload="metadata" value="cima-direita"
  17 + class="box-panel-option selection-panel-option" autoplay>
  18 + <source type="video/webm">
  19 + </video>Cima - Esquerda</li>
  20 + <li><video
  21 + src="{{ server }}/img/{{ movement-name }}/{{ hand-folder }}/plano-direita-baixo.webm"
  22 + preload="metadata" value="direita-baixo"
11 class="box-panel-option selection-panel-option" autoplay> 23 class="box-panel-option selection-panel-option" autoplay>
12 <source type="video/webm"> 24 <source type="video/webm">
13 - </video>Esquerda - Cima</li> 25 + </video>Esquerda - Baixo</li>
14 <li><video 26 <li><video
15 - src="{{ server }}/img/{{ movement-name }}/{{ hand-folder }}/plano-direita-cima.webm" 27 + src="{{ server }}/img/{{ movement-name }}/{{ hand-folder }}/plano-esquerda-cima.webm"
16 preload="metadata" value="esquerda-cima" 28 preload="metadata" value="esquerda-cima"
17 class="box-panel-option selection-panel-option" autoplay> 29 class="box-panel-option selection-panel-option" autoplay>
18 <source type="video/webm"> 30 <source type="video/webm">
19 </video>Direita - Cima</li> 31 </video>Direita - Cima</li>
20 <li><video 32 <li><video
21 - src="{{ server }}/img/{{ movement-name }}/{{ hand-folder }}/plano-frente-esquerda.webm"  
22 - preload="metadata" value="frente-esquerda" 33 + src="{{ server }}/img/{{ movement-name }}/{{ hand-folder }}/plano-baixo-tras.webm"
  34 + preload="metadata" value="baixo-tras"
23 class="box-panel-option selection-panel-option" autoplay> 35 class="box-panel-option selection-panel-option" autoplay>
24 <source type="video/webm"> 36 <source type="video/webm">
25 - </video>Frente - Esquerda</li> 37 + </video>Baixo - Trás</li>
26 <li><video 38 <li><video
27 - src="{{ server }}/img/{{ movement-name }}/{{ hand-folder }}/plano-tras-esquerda.webm"  
28 - preload="metadata" value="tras-esquerda" 39 + src="{{ server }}/img/{{ movement-name }}/{{ hand-folder }}/plano-cima-frente.webm"
  40 + preload="metadata" value="cima-frente"
29 class="box-panel-option selection-panel-option" autoplay> 41 class="box-panel-option selection-panel-option" autoplay>
30 <source type="video/webm"> 42 <source type="video/webm">
31 - </video>Trás - Esquerda</li> 43 + </video>Cima - Frente</li>
32 <li><video 44 <li><video
33 - src="{{ server }}/img/{{ movement-name }}/{{ hand-folder }}/plano-frente-cima.webm"  
34 - preload="metadata" value="frente-cima" 45 + src="{{ server }}/img/{{ movement-name }}/{{ hand-folder }}/plano-frente-baixo.webm"
  46 + preload="metadata" value="frente-baixo"
35 class="box-panel-option selection-panel-option" autoplay> 47 class="box-panel-option selection-panel-option" autoplay>
36 <source type="video/webm"> 48 <source type="video/webm">
37 - </video>Frente - Cima</li> 49 + </video>Frente - Baixo</li>
38 <li><video 50 <li><video
39 src="{{ server }}/img/{{ movement-name }}/{{ hand-folder }}/plano-tras-cima.webm" 51 src="{{ server }}/img/{{ movement-name }}/{{ hand-folder }}/plano-tras-cima.webm"
40 preload="metadata" value="tras-cima" 52 preload="metadata" value="tras-cima"
41 class="box-panel-option selection-panel-option" autoplay> 53 class="box-panel-option selection-panel-option" autoplay>
42 <source type="video/webm"> 54 <source type="video/webm">
43 </video>Trás - Cima</li> 55 </video>Trás - Cima</li>
  56 + <li><video
  57 + src="{{ server }}/img/{{ movement-name }}/{{ hand-folder }}/plano-frente-direita.webm"
  58 + preload="metadata" value="frente-direita"
  59 + class="box-panel-option selection-panel-option" autoplay>
  60 + <source type="video/webm">
  61 + </video>Frente - Esquerda</li>
  62 + <li><video
  63 + src="{{ server }}/img/{{ movement-name }}/{{ hand-folder }}/plano-tras-esquerda.webm"
  64 + preload="metadata" value="tras-esquerda"
  65 + class="box-panel-option selection-panel-option" autoplay>
  66 + <source type="video/webm">
  67 + </video>Trás - Direita</li>
  68 + <li><video
  69 + src="{{ server }}/img/{{ movement-name }}/{{ hand-folder }}/plano-direita-tras.webm"
  70 + preload="metadata" value="direita-tras"
  71 + class="box-panel-option selection-panel-option" autoplay>
  72 + <source type="video/webm">
  73 + </video>Esquerda - Trás</li>
  74 + <li><video
  75 + src="{{ server }}/img/{{ movement-name }}/{{ hand-folder }}/plano-esquerda-frente.webm"
  76 + preload="metadata" value="esquerda-frente"
  77 + class="box-panel-option selection-panel-option" autoplay>
  78 + <source type="video/webm">
  79 + </video>Direita - Frente</li>
44 </ul> 80 </ul>
45 </div> 81 </div>
46 </div> 82 </div>
47 <script type="text/javascript"> 83 <script type="text/javascript">
48 defaultConfigurationHandler.setup("{{ hand }}", "plano", "1"); 84 defaultConfigurationHandler.setup("{{ hand }}", "plano", "1");
49 - defaultConfigurationHandler.startVideoLoop("{{ hand }}", "plano", "1", 2500); 85 + defaultConfigurationHandler.startVideoLoop("{{ hand }}", "plano", "1", 1000);
50 </script> 86 </script>
view/img/circular/md/plano-baixo-esquerda.webm 0 → 100644
No preview for this file type
view/img/circular/md/plano-baixo-tras.webm 0 → 100644
No preview for this file type
view/img/circular/md/plano-cima-direita.webm 0 → 100644
No preview for this file type
view/img/circular/md/plano-cima-frente.webm 0 → 100644
No preview for this file type
view/img/circular/md/plano-direita-baixo.webm 0 → 100644
No preview for this file type
view/img/circular/md/plano-direita-cima.webm
No preview for this file type
view/img/circular/md/plano-direita-tras.webm 0 → 100644
No preview for this file type
view/img/circular/md/plano-esquerda-cima.webm
No preview for this file type
view/img/circular/md/plano-esquerda-frente.webm 0 → 100644
No preview for this file type
view/img/circular/md/plano-frente-baixo.webm 0 → 100644
No preview for this file type
view/img/circular/md/plano-frente-cima.webm
No preview for this file type
view/img/circular/md/plano-frente-direita.webm 0 → 100644
No preview for this file type
view/img/circular/md/plano-frente-esquerda.webm
No preview for this file type
view/img/circular/md/plano-tras-cima.webm
No preview for this file type
view/img/circular/md/plano-tras-esquerda.webm
No preview for this file type
view/img/circular/me/plano-baixo-esquerda.webm 0 → 100644
No preview for this file type
view/img/circular/me/plano-baixo-tras.webm 0 → 100644
No preview for this file type
view/img/circular/me/plano-cima-direita.webm 0 → 100644
No preview for this file type
view/img/circular/me/plano-cima-frente.webm 0 → 100644
No preview for this file type
view/img/circular/me/plano-direita-baixo.webm 0 → 100644
No preview for this file type
view/img/circular/me/plano-direita-tras.webm 0 → 100644
No preview for this file type
view/img/circular/me/plano-esquerda-cima.webm
No preview for this file type
view/img/circular/me/plano-esquerda-frente.webm 0 → 100644
No preview for this file type
view/img/circular/me/plano-frente-baixo.webm 0 → 100644
No preview for this file type
view/img/circular/me/plano-frente-cima.webm
No preview for this file type
view/img/circular/me/plano-frente-direita.webm 0 → 100644
No preview for this file type
view/img/circular/me/plano-frente-esquerda.webm
No preview for this file type
view/img/circular/me/plano-tras-cima.webm 0 → 100644
No preview for this file type
view/img/circular/me/plano-tras-esquerda.webm 0 → 100644
No preview for this file type
view/img/mov/SEMICIRCULAR.webm 0 → 100644
No preview for this file type
view/img/semicircular/md/plano-baixo-esquerda.webm 0 → 100644
No preview for this file type
view/img/semicircular/md/plano-baixo-tras.webm 0 → 100644
No preview for this file type
view/img/semicircular/md/plano-cima-direita.webm 0 → 100644
No preview for this file type
view/img/semicircular/md/plano-cima-frente.webm 0 → 100644
No preview for this file type
view/img/semicircular/md/plano-direita-baixo.webm 0 → 100644
No preview for this file type
view/img/semicircular/md/plano-direita-cima.webm
No preview for this file type
view/img/semicircular/md/plano-direita-tras.webm 0 → 100644
No preview for this file type
view/img/semicircular/md/plano-esquerda-cima.webm
No preview for this file type
view/img/semicircular/md/plano-esquerda-frente.webm 0 → 100644
No preview for this file type
view/img/semicircular/md/plano-frente-baixo.webm 0 → 100644
No preview for this file type
view/img/semicircular/md/plano-frente-cima.webm
No preview for this file type
view/img/semicircular/md/plano-frente-direita.webm 0 → 100644
No preview for this file type
view/img/semicircular/md/plano-frente-esquerda.webm
No preview for this file type
view/img/semicircular/md/plano-tras-cima.webm
No preview for this file type
view/img/semicircular/md/plano-tras-esquerda.webm
No preview for this file type
view/img/semicircular/md/sentido-anti-horario.webm
No preview for this file type
view/img/semicircular/md/sentido-horario.webm
No preview for this file type
view/img/semicircular/me/plano-baixo-esquerda.webm 0 → 100644
No preview for this file type
view/img/semicircular/me/plano-baixo-tras.webm 0 → 100644
No preview for this file type
view/img/semicircular/me/plano-cima-direita.webm 0 → 100644
No preview for this file type
view/img/semicircular/me/plano-cima-frente.webm 0 → 100644
No preview for this file type
view/img/semicircular/me/plano-direita-baixo.webm 0 → 100644
No preview for this file type
view/img/semicircular/me/plano-direita-cima.webm
No preview for this file type
view/img/semicircular/me/plano-direita-tras.webm 0 → 100644
No preview for this file type
view/img/semicircular/me/plano-esquerda-cima.webm
No preview for this file type
view/img/semicircular/me/plano-esquerda-frente.webm 0 → 100644
No preview for this file type
view/img/semicircular/me/plano-frente-baixo.webm 0 → 100644
No preview for this file type
view/img/semicircular/me/plano-frente-cima.webm
No preview for this file type
view/img/semicircular/me/plano-frente-direita.webm 0 → 100644
No preview for this file type
view/img/semicircular/me/plano-frente-esquerda.webm
No preview for this file type
view/img/semicircular/me/plano-tras-cima.webm
No preview for this file type
view/img/semicircular/me/plano-tras-esquerda.webm
No preview for this file type
view/img/semicircular/me/sentido-anti-horario.webm
No preview for this file type
view/img/semicircular/me/sentido-horario.webm
No preview for this file type