Fix angela/wilbur merge conflict

lautr3k · 34c39b5cf8c00bce65b16d6072c64f0cc57fa478 · wilbur-shi committed Aug 4, 2016 · Aug 4, 2016 · 34c39b5
2 parents cedb310 + a66c4b8
commit 34c39b5cf8c00bce65b16d6072c64f0cc57fa478
Unified Split

Showing with 21 additions and 5 deletions.

+21 −5 js/photonic3d.js
diff --git a/js/photonic3d.js b/js/photonic3d.js
@@ -9,10 +9,14 @@ function setPrinterCallibrationSettings(printer) {
 	// console.log(printer);
 	var slicingProfile = printer.configuration.slicingProfile;
 	var monitorDriverConfig = printer.configuration.machineConfig.MonitorDriverConfig;
-	var dotsPermmXYAverage = (slicingProfile.DotsPermmX + slicingProfile.DotsPermmY) / 2;
+	var dotsPermmX = slicingProfile.DotsPermmX;
+	var dotsPermmY = slicingProfile.DotsPermmY;
+	var dotsPermmXYAverage = (dotsPermmX + dotsPermmY) / 2;
+	if (Math.abs(dotsPermmX - dotsrPermmY) >= 0.1) {
+		return true;
+	}
 	var dotsPermmDiagonal = findPythagoreanC(dotsPermmXYAverage, dotsPermmXYAverage);
 	var diagonalNumPixels = findPythagoreanC(monitorDriverConfig.DLP_X_Res, monitorDriverConfig.DLP_Y_Res);
-
 	var diagonalMM = diagonalNumPixels / dotsPermmDiagonal;
 	var buildVolXmm = Math.round(monitorDriverConfig.DLP_X_Res / dotsPermmXYAverage);
 	var buildVolYmm = Math.round(monitorDriverConfig.DLP_Y_Res / dotsPermmXYAverage);
@@ -21,6 +25,8 @@ function setPrinterCallibrationSettings(printer) {
 	// $buildVolumeY.val(buildVolYmm);
 	// updateBuildVolumeSettings();
     
+    /* This is part of updateBuildVolumeSettings() from main.js. I only copied
+    the necessary code that won't result in geometry error */
     var unit = $('#build-volume input[type=radio]:checked').val();
 
     settings.set('buildVolume', {
@@ -38,21 +44,31 @@ function setPrinterCallibrationSettings(printer) {
 	$('#screen-diagonal-unit-in').prop('checked', false);
 	$('#screen-diagonal-unit-mm').prop('checked', true);
 	$screenDiagonalSize.val(diagonalMM);
-
 	updateScreenSettings();
+
+	// No error occurred so return false
+	return false;
 }
 
 // Initialize values
 function initializeValues() {
 	$slicerSpeedYes[0].checked = true;
 	$slicerSpeedNo[0].checked = false;
-	updateSlicerSettings();
+	$slicerSpeedDelay.val = 0;
+	$settings.set('#slicer.panel.collapsed', true);
+	$slicerBody.collapse('hide');
 
+	updateSlicerSettings();
+	var XYerr = false;
 	var printer = $.get( "/services/printers/getFirstAvailablePrinter", function( data ) {
 		if (data !== null && data !== undefined) {
-			setPrinterCallibrationSettings(data);
+			XYerr = setPrinterCallibrationSettings(data);
 		}
 	});
+
+	if (XYerr) {
+		// Error handling
+	}
 }
 
 // $(window).bind('load', initializeValues);