Merge pull request #10 from iamjosephvarghese/fruit_checker

josephv7 · web-flow · commit 370264157d1c · 2019-02-14T15:19:26.000+05:30
Final changes done to mango sorter code
diff --git a/FruitChecker/index.html b/FruitChecker/index.html
@@ -15,18 +15,18 @@
 </head>
 <body>
 	<div id="results"></div>
-	
+
 	<h1>Mango Sorter</h1>
 	<!-- <h3>Demonstrates simple 320x240 capture &amp; display</h3> -->
-	
+
 	<div id="my_camera"></div>
 
-	
 
-	
+
+
 	<!-- First, include the Webcam.js JavaScript Library -->
 	<script src="https://cdnjs.cloudflare.com/ajax/libs/webcamjs/1.0.25/webcam.min.js"></script>
-	
+
 	<!-- Configure a few settings and attach camera -->
 	<script language="JavaScript">
 		Webcam.set({
@@ -37,7 +37,7 @@ <h1>Mango Sorter</h1>
 		});
 		Webcam.attach( '#my_camera' );
 	</script>
-	
+
 	<!-- A button for taking snaps -->
 	<form>
 		<input type=button value="Take Snapshot" onClick="take_snapshot()">
@@ -50,7 +50,7 @@ <h1>Mango Sorter</h1>
 	<hr>
 	<div id="detectedColor"></div>
 	<div id="hashedFile"></div>
-	
+
 	<!-- Code to handle taking the snapshot and displaying it locally -->
 	<script language="JavaScript">
 
@@ -66,11 +66,11 @@ <h1>Mango Sorter</h1>
 				axios.get(urlQuery).then(function (response) {
 
 					console.log(response.data);
-					document.getElementById('hashedFile').innerHTML = 
+					document.getElementById('hashedFile').innerHTML =
 					'<h3>Hashed File :' + response.data + '</h3>';
-	    
+
 	  		}).then(function (response){
-			
+
 				}).catch(function (error) {
 	   			 console.log(error);
 	  		});
@@ -83,8 +83,8 @@ <h1>Mango Sorter</h1>
 			// take snapshot and get image data
 			Webcam.snap( function(data_uri) {
 				// display results in page
-				document.getElementById('results').innerHTML = 
-					'<h2>Here is your image:</h2>' + 
+				document.getElementById('results').innerHTML =
+					'<h2>Here is your image:</h2>' +
 					'<img src="'+data_uri+'"/>';
 					console.log(data_uri);
 					var noHeader = data_uri.replace(/^data:image\/(png|jpg|jpeg);base64,/, "")
@@ -114,19 +114,19 @@ <h1>Mango Sorter</h1>
 			if(temp.toString() == 'red'){
 				console.log('in website red');
 				redCount++;
-				document.getElementById('detectedColor').innerHTML = 
+				document.getElementById('detectedColor').innerHTML =
 					'<h2>Color:Red</h2>';
 				console.log('redCount' + redCount);
 			}else if(temp.toString() == 'green'){
 				console.log('in website green')
 				greenCount++;
-				document.getElementById('detectedColor').innerHTML = 
+				document.getElementById('detectedColor').innerHTML =
 					'<h2>Color:Green</h2>';
 				console.log('greenCount' + greenCount);
 			}
 
-			
-			
+
+
 	  }).then(function (response){
 
 
@@ -148,33 +148,33 @@ <h1>Mango Sorter</h1>
 
 
 					// };
-					e.open("POST","https://vision.googleapis.com/v1/images:annotate?key=AIzaSyAWMDKyl8B_CNEToy1fCwX8wh8LWLFf3_0",!0);
+					e.open("POST","https://vision.googleapis.com/v1/images:annotate?key=API_KEY_HERE",!0);
 					e.send(b)
-					
+
 
 
 					// let request = {"requests":[{	"image":{	"content":noHeader},	"features": [{"type": "IMAGE_PROPERTIES"},]}]}
 					// console.log(request);
 
 				// 	axios.post('https://vision.googleapis.com/v1/images:annotate?key=AIzaSyAWMDKyl8B_CNEToy1fCwX8wh8LWLFf3_0', {
 				// 		b
-						
+
   			// }).then(function (response) {
 				// console.log('inside success');
     		// console.log(response);
   			// }).catch(function (error) {
 				// 	console.log('inside error');
     		// console.log(error);
 				// });
-				
-				
+
+
 
 
 
 
 			} );
 		}
 	</script>
-	
+
 </body>
-</html>
+</html>
diff --git a/FruitChecker/index.js b/FruitChecker/index.js
@@ -97,7 +97,7 @@ console.log('HSL Main Value' + Math.round(hsl[0]));
 if(Math.round(hsl[0]) > 0 && Math.round(hsl[0]) < 65 ){
     res.send('red');
     console.log('red')
-}else if(Math.round(hsl[0]) > 120 && Math.round(hsl[0]) < 180){
+}else if(Math.round(hsl[0]) > 100 && Math.round(hsl[0]) < 180){
     res.send('green');
     console.log('green')
 }

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ console.log('HSL Main Value' + Math.round(hsl[0]));`
`97`	`97`	`if(Math.round(hsl[0]) > 0 && Math.round(hsl[0]) < 65 ){`
`98`	`98`	`res.send('red');`
`99`	`99`	`console.log('red')`
`100`		`-}else if(Math.round(hsl[0]) > 120 && Math.round(hsl[0]) < 180){`
	`100`	`+}else if(Math.round(hsl[0]) > 100 && Math.round(hsl[0]) < 180){`
`101`	`101`	`res.send('green');`
`102`	`102`	`console.log('green')`
`103`	`103`	`}`