SvgNest.load(): Return placed/total separately in callback

The '44/88' pars string is a UI thing, should be in UI code
harveyyeung · Aug 4, 2017 · 65a3088 · 65a3088
1 parent c88dc4d
commit 65a3088
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/index.html b/index.html
@@ -438,7 +438,7 @@
 
 			var iterations = 0;
 
-			function renderSvg(svglist, efficiency, numplaced){
+			function renderSvg(svglist, efficiency, placed, total){
 				iterations++;
 				document.getElementById('info_iterations').innerHTML = iterations;
 
@@ -458,8 +458,8 @@
 				if(efficiency || efficiency === 0){
 					document.getElementById('info_efficiency').innerHTML = Math.round(efficiency*100);
 				}
-				
-				document.getElementById('info_placed').innerHTML = numplaced;
+
+				document.getElementById('info_placed').innerHTML = placed+'/'+total;
 
 				document.getElementById('info_placement').setAttribute('style','display: block');
 				display.setAttribute('style','display: none');

diff --git a/svgnest.js b/svgnest.js
@@ -576,7 +576,7 @@
 								numPlacedParts++;
 							}
 						}
-						displayCallback(self.applyPlacement(best.placements), placedArea/totalArea, numPlacedParts+'/'+numParts);
+						displayCallback(self.applyPlacement(best.placements), placedArea/totalArea, numPlacedParts, numParts);
 					}
 					else{
 						displayCallback();