trakers: comparison front_idill/src/mosaic/js/mosaic.js

Mercurial Mercurial > trakers / comparison

summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help

front_idill/src/mosaic/js/mosaic.js

changeset 47	4e1ee94d70b1
parent 46	9d7a2aa112fb
child 52	277c94533395

equal deleted inserted replaced

-:9d7a2aa112fb
+:4e1ee94d70b1
 	this.lastNonNullSN = null;
 	//Largeur de la marge pour le centrage vertical de la mosaïque.
 	this.MPTop_margin;
 	this.top_margin;
-	//Gesture actuellement cherchée.
+	//Gestures actuellement cherchées dans les vidéos.
-	this.currentSearchGesture = '';
+	this.currentSearchGesture = [];
 	//Mosaïque locale.
 	this.localMos;
 	//Position des voisins lors d'un zoom.
 	this.neighboursIds = [];
 		{
 			for(var i = 0 ; i < imgs ; i++)
 			{
 				//On charge les images de petite taille pour ne pas surcharger la mosaïque lors de l'affichage global.
 				str += '<div id="snapshotDiv-' + i + '" class="snapshotDivs" style="opacity: 0;"><img id="snapshot-' + i + '" class="snapshots" src="snapshots-little/' + this.imgs[i] + '" /></div>';
+				//Au départ aucune vidéo n'a de gesture de recherche.
+				this.currentSearchGesture[i] = '';
 			}
 		}
 		return str + '<div id="ghostPanel"></div>';
 	}
 				//_this.isSearchByCurvesOn = true;
 				// _this.startSearch();
 				// console.log('CANVAS READY');
 				// /!\ //
-				/*_this.currentSearchGesture = 'bend';
-				_this.currentMode = 'FILTER';
-				_this.searchFilter('bend');*/
 				_this.previousZoomedSN = $('#snapshotDiv-' + _this.fillingIds[0]);
 			}
 		});
 	}
 						_this.isSearchByCurvesOn = true;
 						_this.startSearch();
 						/*if(!_this.curvesGesturesFound)
 						{
-							$('.notifications').remove();
+							this.removeNotifications();
 							_this.filterSearch();
 						}*/
 						_this.searchCanvas.onPointerIn(_this.mousePosX, _this.mousePosY - _this.MPTop_margin, null, null);
 					}
 						_this.isSearchByCurvesOn = true;
 						_this.startSearch();
 						/*if(!_this.curvesGesturesFound)
 						{
-							$('.notifications').remove();
+							this.removeNotifications();
 							_this.searchSearch();
 						}*/
 						_this.searchCanvas.onPointerIn(_this.mousePosX, _this.mousePosY - _this.MPTop_margin, null, null);
 					}
 						if(_this.currentMode == "SEARCH" && _this.playerIsReady)
 						{
 							_this.player.widgets[0].searchByGesture(gesture_match);
 							_this.isCurrentlyInASearchByGesture = _this.player.widgets[0].isCurrentlyInASearchByGesture;
-							$('.notifications').remove();
+							if(_this.player && _this.player.widgets[0] && _this.timeToGoAt[_this.centerId] === 0 && _this.player.widgets[0].atLeastOneSearchMarker(_this.currentSearchGesture[_this.centerId]))
+							{
+								_this.player.widgets[0].goToFirstSearchedMarker(_this.currentSearchGesture[_this.centerId]);
+							}
+							_this.removeNotifications();
+							_this.currentSearchGesture[_this.centerId] = gesture_match;
 							_this.searchGesture(gesture_match, 'valid');
 							_this.curvesGesturesFound = false;
 						}
 						else if(_this.currentMode == "FILTER")
 						{
 							if(_this.isMosaicFiltered)
 							{
-								$('.notifications').remove();
+								_this.removeNotifications();
 								_this.filterSearchedType = gesture_match;
 								_this.filterGesture(gesture_match, 'valid');
 								_this.searchFilter(gesture_match);
 								_this.curvesGesturesFound = false;
 							}
 				_this.mouseUpDownDelta = 0;
 				_this.isSearchByCurvesOn = false;
 				_this.leaveSearch();
-				if(_this.currentMode == 'FILTER' && _this.filterSearchedType != '')//if(_this.currentSearchGesture != '')
+				if(_this.currentMode == 'FILTER' && _this.filterSearchedType != '')
 				{
-					$('.notifications').remove();
+					_this.removeNotifications();
-					_this.filterGesture(_this.currentSearchGesture, 'valid');
+					_this.filterGesture(_this.filterSearchedType, 'valid');
 				}
 			});
 		});
 	}
 }
 	//Si il y a plus d'un snapshot à afficher, on entre dans le mode INCOMING avec en paramètre le nombre à afficher.
 	if(n > 1 && n < this.config['imagesToShow'])
 	{
 		this.currentMode = "INCOMING-" + n;
 		this.unzoom();
-		this.currentSearchGesture = '';
-		$('.notifications').remove();
+		for(var i = 0 ; i < this.config['imagesToShow'] ; i++)
+		{
+			this.currentSearchGesture[i] = '';
+		}
+		this.removeNotifications();
 		this.isMosaicFiltered = false;
 		this.isCurrentlyInASearchByGesture = false;
 		$('#mainPointer').fadeTo(this.config['timePrezoom'], 0);
 		$('#secondPointer').fadeTo(this.config['timePrezoom'], 0);
 		$('#spinner').remove();
 				this.currentMode = "INCOMING-20";
 				this.unzoom();
 			}
 			this.currentMode = "MOSAIC";
-			$('.notifications').remove();
+			this.removeNotifications();
 			this.mosaicSelectionAndSearch();
 			clearTimeout(this.nouserTimeout);
 			console.log('OK');
 		}
 		//On affiche les notifications.
 	{
 		if(this.player && this.player.widgets && this.playerIsReady && !this.isSwipe)
 		{
 			this.isSwipe = true;
-			if(this.currentMode == 'SEARCH' && this.isMosaicFiltered && !this.player.widgets[0].isAMarkerAhead(this.currentSearchGesture))
+			if(this.currentMode == 'SEARCH' && this.isMosaicFiltered && !this.player.widgets[0].isAMarkerAhead(this.currentSearchGesture[this.centerId]))
 			{
 				this.playNextVideo();
 			}
 			//L'utilisateur a fait un swipe left.
 			if(event.indexOf("LEFT") != -1)
 			{
-				this.player.widgets[0].switchToMarker(true, this.currentSearchGesture);
+				this.player.widgets[0].switchToMarker(true, this.currentSearchGesture[this.centerId]);
 				if(this.currentMode == 'VIDEO')
 				{
-					$('.notifications').remove();
+					this.removeNotifications();
 					this.videoSwipe('left');
 				}
-				else if(this.currentMode == 'SEARCH' && !this.currentSearchGesture)
+				else if(this.currentMode == 'SEARCH' && !this.currentSearchGesture[this.centerId])
 				{
-					$('.notifications').remove();
+					this.removeNotifications();
 					this.searchSearchAndSwipe('left');
 				}
-				else if(this.currentMode == 'SEARCH' && this.currentSearchGesture)
+				else if(this.currentMode == 'SEARCH' && this.currentSearchGesture[this.centerId])
 				{
-					$('.notifications').remove();
+					this.removeNotifications();
-					this.searchGestureAndSwipe(this.currentSearchGesture, 'valid', 'left');
+					this.searchGestureAndSwipe(this.currentSearchGesture[this.centerId], 'valid', 'left');
 				}
 			}
 			//L'utilisateur a fait un swipe right.
 			else if(event.indexOf("RIGHT") != -1)
 			{
-				this.player.widgets[0].switchToMarker(false, this.currentSearchGesture);
+				this.player.widgets[0].switchToMarker(false, this.currentSearchGesture[this.centerId]);
 				if(this.currentMode == 'VIDEO')
 				{
-					$('.notifications').remove();
+					this.removeNotifications();
 					this.videoSwipe('right');
 				}
-				else if(this.currentMode == 'SEARCH' && !this.currentSearchGesture)
+				else if(this.currentMode == 'SEARCH' && !this.currentSearchGesture[this.centerId])
 				{
-					$('.notifications').remove();
+					this.removeNotifications();
 					this.searchSearchAndSwipe('right');
 				}
-				else if(this.currentMode == 'SEARCH' && this.currentSearchGesture)
+				else if(this.currentMode == 'SEARCH' && this.currentSearchGesture[this.centerId])
 				{
-					$('.notifications').remove();
+					this.removeNotifications();
-					this.searchGestureAndSwipe(this.currentSearchGesture, 'valid', 'right');
+					this.searchGestureAndSwipe(this.currentSearchGesture[this.centerId], 'valid', 'right');
 				}
 			}
 			//On le fait disparaitre au bout d'un certain temps.
 			this.notifySwipeTimeout = setTimeout(function()
 			{
 				_this.isSwipe = false;
 				// /!\ //
-				$('.notifications').remove();
+				_this.removeNotifications();
-				if(_this.currentMode == 'SEARCH' && !_this.currentSearchGesture)
+				if(_this.currentMode == 'SEARCH' && !_this.currentSearchGesture[_this.centerId])
 				{
 					_this.searchSearch();
 				}
-				else if(_this.currentMode == 'SEARCH' && _this.currentSearchGesture)
+				else if(_this.currentMode == 'SEARCH' && _this.currentSearchGesture[_this.centerId])
 				{
-					_this.searchGesture(_this.currentSearchGesture, 'valid');
+					_this.searchGesture(_this.currentSearchGesture[_this.centerId], 'valid');
 				}
 			}, this.config['timeoutNotifySwipe']);
 		}
 	}
 	else if(event.indexOf("BEND") != -1 || event.indexOf('KNEE-UP') != -1 || event.indexOf('FALL') != -1 || event.indexOf('JUMP') != -1)
 	{
 		gestureReceived = event.toLowerCase();
 		gestureReceived = gestureReceived.replace('wave', 'hello');
-		this.currentSearchGesture = gestureReceived;
+		this.currentSearchGesture[centerId] = gestureReceived;
 	}
 	else if(event.indexOf("HELLO") != -1 && this.canNotifyHelp && !this.areBothPointersHere)
 	{
 		if(this.currentMode == 'SEARCH')
 		{
 		if(this.currentMode == "SEARCH" && this.playerIsReady)
 		{
 			this.player.widgets[0].searchByGesture(gestureReceived);
 			this.isCurrentlyInASearchByGesture = this.player.widgets[0].isCurrentlyInASearchByGesture;
-			$('.notifications').remove();
+			this.removeNotifications();
 			this.searchGesture(gestureReceived, 'valid');
 		}
 		else if(this.currentMode == "FILTER")
 		{
 			if(this.isMosaicFiltered)
 			{
 				// console.log('FILTER !!!');
 				// this.notifySearch1Gesture(gestureReceived, 'valid');
-				$('.notifications').remove();
+				this.removeNotifications();
 				this.filterGesture(gestureReceived, 'valid');
 				this.searchFilter(gestureReceived);
 			}
 		}
 					_this.canSwipe = true;
 				}
 				console.log('TIME TO GO AT : ' + _this.timeToGoAt[_this.centerId], _this.centerId, _this.imgs[_this.centerId]);
-				if(_this.isMosaicFiltered)
+				// if(_this.isMosaicFiltered)
-				{
+				// {
-					if(_this.currentSearchGesture == '')
+					if(_this.currentSearchGesture[_this.centerId] == '')
 					{
 						_this.removeFilter();
 					}
 					else
 					{
 						_this.currentMode = 'SEARCH';
 						// console.log(_this.currentSearchGesture);
-						_this.player.widgets[0].searchByGesture(_this.currentSearchGesture);
+						_this.player.widgets[0].searchByGesture(_this.currentSearchGesture[_this.centerId]);
 						_this.isCurrentlyInASearchByGesture = _this.player.widgets[0].isCurrentlyInASearchByGesture;
-						if(_this.timeToGoAt[_this.centerId] === 0 && _this.player.widgets[0].atLeastOneSearchMarker(_this.currentSearchGesture))
+						if(_this.timeToGoAt[_this.centerId] === 0 && _this.player.widgets[0].atLeastOneSearchMarker(_this.currentSearchGesture[_this.centerId]))
 						{
-							_this.player.widgets[0].goToFirstSearchedMarker(_this.currentSearchGesture);
+							_this.player.widgets[0].goToFirstSearchedMarker(_this.currentSearchGesture[_this.centerId]);
 						}
 						else
 						{
 							_this.player.popcorn.currentTime(_this.timeToGoAt[_this.centerId]);
 						}
 					}
-				}
+				// }
 				// /!\ //
-				else
+				/*else
 				{
 					if(_this.player.popcorn)
 					{
 						_this.player.popcorn.currentTime(_this.timeToGoAt[_this.centerId]);
 					}
-				}
+				}*/
 			});
 		}
 	});
 }

trakers