trakers: comparison front_idill/src/communication/js/client.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/communication/js/client.js

changeset 58	a28488078053
parent 52	277c94533395
child 59	e812126f75f4

equal deleted inserted replaced

-:d0c393730443
+:a28488078053
 		var instruction = msg.data.substring(2, msg.data.length);
 		pt = instruction.split(';');
 		var x = Math.abs(parseFloat(pt[0])), y = Math.abs(parseFloat(pt[1]));
 		// console.log(Math.abs(parseFloat(pt[0])), Math.abs(parseFloat(pt[1])));
-		this.pointerLeft = true;
+		this.pointerRight = true;
-		clearTimeout(this.pointerLeftTimeout);
+		clearTimeout(this.pointerRightTimeout);
 		if(!this.mosaic.mouseInteractions && this.mosaic.currentMode != 'NO-USER' && this.mosaic.currentMode.indexOf('INCOMING') == -1)
 		{
 			// console.log('pt');
 			this.mosaic.refreshPointers(x, y, true);
 		{
 			this.mosaic.mainPointerDisplay(true);
 			this.mosaic.isMainPointerDisplayed = true;
 		}
-		this.pointerLeftTimeout = setTimeout(function()
+		this.pointerRightTimeout = setTimeout(function()
 		{
 			// console.log('RELEASE LEFT');
-			_this.pointerLeft = false;
+			//Timeout indiquant quand la main gauche part.
+			_this.pointerRight = false;
 			if(_this.mosaic.isMainPointerDisplayed)
 			{
 				_this.mosaic.isMainPointerDisplayed = false;
 				_this.mosaic.mainPointerDisplay(false);
+			}
+			if(_this.mosaic.isSearchByCurvesOn)
+			{
+				_this.mosaic.isSearchByCurvesOn = false;
+				if(_this.mosaic.searchCanvas)
+				{
+					_this.mosaic.searchCanvas.onPointerOut();
+					$('#mainPointer').css('background-image', 'url(./img/cursors/pointerC.png)');
+					$('#secondPointer').css('background-image', 'url(./img/cursors/pointer2C.png)');
+				}
+			}
+			//On peut effectuer de nouveau une recherche par courbes.
+			if(!_this.pointerLeft)
+			{
+				_this.mosaic.mustTakeOutHands = false;
 			}
 		}, this.timePointers);
 	}
 	//Sinon si ce sont les coordonnées de la main gauche.
 	else if(msg.data[0] == '0')
 		var instruction = msg.data.substring(2, msg.data.length);
 		pt = instruction.split(';');
 		var x = Math.abs(parseFloat(pt[0])), y = Math.abs(parseFloat(pt[1]));
 		// console.log(Math.abs(parseFloat(pt[0])), Math.abs(parseFloat(pt[1])));
-		this.pointerRight = true;
+		this.pointerLeft = true;
-		clearTimeout(this.pointerRightTimeout);
+		clearTimeout(this.pointerLeftTimeout);
 		if(!this.mosaic.mouseInteractions && this.mosaic.currentMode != 'NO-USER' && this.mosaic.currentMode.indexOf('INCOMING') == -1)
 		{
 			this.mosaic.refreshPointers(x, y, false);
 		}
 		{
 			this.mosaic.secondPointerDisplay(true);
 			this.mosaic.isSecondPointerDisplayed = true;
 		}
-		this.pointerRightTimeout = setTimeout(function()
+		//Timeout indiquant quand la main droite part.
+		this.pointerLeftTimeout = setTimeout(function()
 		{
 			// console.log('RELEASE RIGHT');
-			_this.pointerRight = false;
+			_this.pointerLeft = false;
 			if(_this.mosaic.isSecondPointerDisplayed)
 			{
 				_this.mosaic.isSecondPointerDisplayed = false;
 				_this.mosaic.secondPointerDisplay(false);
+			}
+			if(_this.mosaic.isSearchByCurvesOn)
+			{
+				_this.mosaic.isSearchByCurvesOn = false;
+				if(_this.mosaic.searchCanvas)
+				{
+					_this.mosaic.searchCanvas.onPointerOut();
+					$('#mainPointer').css('background-image', 'url(./img/cursors/pointerC.png)');
+					$('#secondPointer').css('background-image', 'url(./img/cursors/pointer2C.png)');
+				}
+			}
+			//On peut effectuer de nouveau une recherche par courbes.
+			if(!_this.pointerRight)
+			{
+				_this.mosaic.mustTakeOutHands = false;
 			}
 		}, this.timePointers);
 	}
 	if(this.pointerLeft && !this.pointerRight || !this.pointerLeft && this.pointerRight)
 	{
 		//On interrompt l'idle des pointeurs.
 		this.mosaic.pointersIdleAvailable = false;
 		this.mosaic.removeIdlePointers();
 		this.mosaic.areBothPointersHere = false;
-		if(this.mosaic.isSearchByCurvesOn)
-		{
-			this.mosaic.isSearchByCurvesOn = false;
-			if(this.mosaic.searchCanvas)
-			{
-				this.mosaic.searchCanvas.onPointerOut();
-				console.log('OUT !!!!!');
-			}
-		}
 	}
 	if(!this.pointerLeft && !this.pointerRight)
 	{
 		//On interrompt l'idle des pointeurs.
 		this.mosaic.pointersIdleAvailable = false;
 		this.mosaic.removeIdlePointers();
 		this.mosaic.areBothPointersHere = false;
-		if(this.mosaic.isSearchByCurvesOn)
-		{
-			this.mosaic.isSearchByCurvesOn = false;
-			if(this.mosaic.searchCanvas)
-			{
-				this.mosaic.searchCanvas.onPointerOut();
-			}
-		}
 		this.mosaic.deselectAllNeighbours();
 		this.mosaic.preUnzoom();
 	}
 	if(this.pointerLeft && this.pointerRight)
 	{
 		this.mosaic.areBothPointersHere = true;
 		this.mosaic.removeCheckForBothPointersHere();
-		if(this.mosaic.currentMode == 'MOSAIC' || this.mosaic.currentMode == 'FILTER')
+		//On enlève les requêtes de zoom.
-		{
+		this.mosaic.preUnzoom();
-			$('#mainPointer').css('background-image', './img/cursors/pointer.png');
-			$('#secondPointer').css('background-image', './img/cursors/pointer2.png');
+		if(this.mosaic.currentMode == 'MOSAIC' || this.mosaic.currentMode == 'FILTER' && !this.mosaic.isSearchByCurvesOn)
-		}
+		{
+			$('#mainPointer').css('background-image', 'url(./img/cursors/pointer.png)');
-		if(this.mosaic.currentMode == 'FILTER' || this.mosaic.currentMode == 'SEARCH')
+			$('#secondPointer').css('background-image', 'url(./img/cursors/pointer2.png)');
-		{
+		}
+		//Si on est dans un des modes de recherche et que les mains ont été retirées après la précédente recherche.
+		if((this.mosaic.currentMode == 'FILTER' || this.mosaic.currentMode == 'SEARCH') && !this.mosaic.mustTakeOutHands)
+		{
+			console.log('ON');
 			if(this.mosaic.searchCanvas)
 			{
 				var mainPointerX = +$('#mainPointer').position().left + $('#mainPointer').width() / 2;
 				var mainPointerY = +$('#mainPointer').position().top - this.mosaic.MPTop_margin + $('#mainPointer').height() / 2;
-				var secondPointerX = +$('#secondPointer').position().left + $('#mainPointer').width() / 2;
+				var secondPointerX = +$('#secondPointer').position().left + $('#secondPointer').width() / 2;
-				var secondPointerY = +$('#secondPointer').position().top - this.mosaic.MPTop_margin + $('#mainPointer').height() / 2;
+				var secondPointerY = +$('#secondPointer').position().top - this.mosaic.MPTop_margin + $('#secondPointer').height() / 2;
 				if(!this.mosaic.isSearchByCurvesOn)
 				{
 					this.mosaic.isSearchByCurvesOn = true;
+					this.mosaic.searchCanvas.onPointerOut();
 					this.mosaic.searchCanvas.onPointerIn(mainPointerX, mainPointerY, secondPointerX, secondPointerY);
 					this.mosaic.canDrawNextCurve = true;
+					this.mosaic.pointersGreen();
 				}
 				else if(this.mosaic.isSearchByCurvesOn)
 				{
 					if(this.mosaic.canDrawNextCurve)
 					{
 						this.mosaic.canDrawNextCurve = false;
 						if(Math.abs(mainPointerX - this.mosaic.mainPointerLastX) > 10 || Math.abs(mainPointerY - this.mosaic.mainPointerLastY) > 10 || Math.abs(secondPointerX - this.mosaic.secondPointerLastX) > 10 || Math.abs(secondPointerY - this.mosaic.secondPointerLastY) > 10)
 						{
-							console.log('move');
 							this.mosaic.searchCanvas.onPointerMove(mainPointerX, mainPointerY, secondPointerX, secondPointerY);
+							this.mosaic.pointersGreen();
 						}
 					}
 					else
 					{
 						this.mosaic.nextDrawCurveTimeout = setTimeout(function()
 							_this.mosaic.canDrawNextCurve = true;
 						}, this.mosaic.config.timeoutNextDrawCurve);
 					}
 				}
 			}
+			else
+			{
+				this.mosaic.startSearch();
+			}
 		}
 	}
 	//Quant on a reçu un message, on vérifie la présence des deux pointeurs.
 	this.mosaic.checkForBothPointersHere();

trakers