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

Adabriand Furtado
1 parent adda3f9a
Showing 67 changed files with 51 additions and 37 deletions Show diff stats
view/assets/js/tmpJSONParser.js
view/hand/movimento/passo-1.html
view/hand/plano/passo-1.html
view/img/circular/md/plano-baixo-esquerda.webm
view/img/circular/md/plano-baixo-tras.webm
view/img/circular/md/plano-cima-direita.webm
view/img/circular/md/plano-cima-frente.webm
view/img/circular/md/plano-direita-baixo.webm
view/img/circular/md/plano-direita-cima.webm
view/img/circular/md/plano-direita-tras.webm
view/img/circular/md/plano-esquerda-cima.webm
view/img/circular/md/plano-esquerda-frente.webm
view/img/circular/md/plano-frente-baixo.webm
view/img/circular/md/plano-frente-cima.webm
view/img/circular/md/plano-frente-direita.webm
view/img/circular/md/plano-frente-esquerda.webm
view/img/circular/md/plano-tras-cima.webm
view/img/circular/md/plano-tras-esquerda.webm
view/img/circular/me/plano-baixo-esquerda.webm
view/img/circular/me/plano-baixo-tras.webm
@@ -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);
     }
@@ -20,7 +20,7 @@
 					class="box-panel-option selection-panel-option" autoplay loop>
 					<source type="video/webm">
 				</video> Circular</li>
-			<li><video src="{{ server }}/img/mov/CIRCULAR.webm"
+			<li><video src="{{ server }}/img/mov/SEMICIRCULAR.webm"
 					preload="metadata" value="semicircular"
 					class="box-panel-option selection-panel-option" autoplay loop>
 					<source type="video/webm">
@@ -6,45 +6,81 @@
 	<div class="selection-panel-inner-body">
 		<ul class="rig columns-2">
 			<li><video
-					src="{{ server }}/img/{{ movement-name }}/{{ hand-folder }}/plano-esquerda-cima.webm"
-					preload="metadata" value="direita-cima"
+					src="{{ server }}/img/{{ movement-name }}/{{ hand-folder }}/plano-baixo-esquerda.webm"
+					preload="metadata" value="baixo-esquerda"
+					class="box-panel-option selection-panel-option" autoplay>
+					<source type="video/webm">
+				</video>Baixo - Direita</li>
+			<li><video
+					src="{{ server }}/img/{{ movement-name }}/{{ hand-folder }}/plano-cima-direita.webm"
+					preload="metadata" value="cima-direita"
+					class="box-panel-option selection-panel-option" autoplay>
+					<source type="video/webm">
+				</video>Cima - Esquerda</li>
+			<li><video
+					src="{{ server }}/img/{{ movement-name }}/{{ hand-folder }}/plano-direita-baixo.webm"
+					preload="metadata" value="direita-baixo"
 					class="box-panel-option selection-panel-option" autoplay>
 					<source type="video/webm">
-				</video>Esquerda - Cima</li>
+				</video>Esquerda - Baixo</li>
 			<li><video
-					src="{{ server }}/img/{{ movement-name }}/{{ hand-folder }}/plano-direita-cima.webm"
+					src="{{ server }}/img/{{ movement-name }}/{{ hand-folder }}/plano-esquerda-cima.webm"
 					preload="metadata" value="esquerda-cima"
 					class="box-panel-option selection-panel-option" autoplay>
 					<source type="video/webm">
 				</video>Direita - Cima</li>
 			<li><video
-					src="{{ server }}/img/{{ movement-name }}/{{ hand-folder }}/plano-frente-esquerda.webm"
-					preload="metadata" value="frente-esquerda"
+					src="{{ server }}/img/{{ movement-name }}/{{ hand-folder }}/plano-baixo-tras.webm"
+					preload="metadata" value="baixo-tras"
 					class="box-panel-option selection-panel-option" autoplay>
 					<source type="video/webm">
-				</video>Frente - Esquerda</li>
+				</video>Baixo - Trás</li>
 			<li><video
-					src="{{ server }}/img/{{ movement-name }}/{{ hand-folder }}/plano-tras-esquerda.webm"
-					preload="metadata" value="tras-esquerda"
+					src="{{ server }}/img/{{ movement-name }}/{{ hand-folder }}/plano-cima-frente.webm"
+					preload="metadata" value="cima-frente"
 					class="box-panel-option selection-panel-option" autoplay>
 					<source type="video/webm">
-				</video>Trás - Esquerda</li>
+				</video>Cima - Frente</li>
 			<li><video
-					src="{{ server }}/img/{{ movement-name }}/{{ hand-folder }}/plano-frente-cima.webm"
-					preload="metadata" value="frente-cima"
+					src="{{ server }}/img/{{ movement-name }}/{{ hand-folder }}/plano-frente-baixo.webm"
+					preload="metadata" value="frente-baixo"
 					class="box-panel-option selection-panel-option" autoplay>
 					<source type="video/webm">
-				</video>Frente - Cima</li>
+				</video>Frente - Baixo</li>
 			<li><video
 					src="{{ server }}/img/{{ movement-name }}/{{ hand-folder }}/plano-tras-cima.webm"
 					preload="metadata" value="tras-cima"
 					class="box-panel-option selection-panel-option" autoplay>
 					<source type="video/webm">
 				</video>Trás - Cima</li>
+			<li><video
+					src="{{ server }}/img/{{ movement-name }}/{{ hand-folder }}/plano-frente-direita.webm"
+					preload="metadata" value="frente-direita"
+					class="box-panel-option selection-panel-option" autoplay>
+					<source type="video/webm">
+				</video>Frente - Esquerda</li>
+			<li><video
+					src="{{ server }}/img/{{ movement-name }}/{{ hand-folder }}/plano-tras-esquerda.webm"
+					preload="metadata" value="tras-esquerda"
+					class="box-panel-option selection-panel-option" autoplay>
+					<source type="video/webm">
+				</video>Trás - Direita</li>	
+			<li><video
+					src="{{ server }}/img/{{ movement-name }}/{{ hand-folder }}/plano-direita-tras.webm"
+					preload="metadata" value="direita-tras"
+					class="box-panel-option selection-panel-option" autoplay>
+					<source type="video/webm">
+				</video>Esquerda - Trás</li>
+			<li><video
+					src="{{ server }}/img/{{ movement-name }}/{{ hand-folder }}/plano-esquerda-frente.webm"
+					preload="metadata" value="esquerda-frente"
+					class="box-panel-option selection-panel-option" autoplay>
+					<source type="video/webm">
+				</video>Direita - Frente</li>
 		</ul>
 	</div>
 </div>
 <script type="text/javascript">
 	defaultConfigurationHandler.setup("{{ hand }}", "plano", "1");
-	defaultConfigurationHandler.startVideoLoop("{{ hand }}", "plano", "1", 2500);
+	defaultConfigurationHandler.startVideoLoop("{{ hand }}", "plano", "1", 1000);
 </script>
	@@ -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	}
	@@ -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">