Revert

lautr3k · 9b7ef81ed47cbb71e5f5a9339eb2f40842f31894 · wilbur-shi committed Aug 4, 2016 · Aug 4, 2016 · 9b7ef81
1 parent 34c39b5
commit 9b7ef81ed47cbb71e5f5a9339eb2f40842f31894
Unified Split

Showing with 1 addition and 78 deletions.

+0 −1 index.html

+1 −1 js/main.js

+0 −76 js/photonic3d.js
diff --git a/index.html b/index.html
@@ -359,6 +359,5 @@ <h3 class="panel-title">Colors</h3>
         <script src="vendor/FileSaver.min.js" type="text/javascript"></script>
         <script src="vendor/jszip.min.js" type="text/javascript"></script>
         <script src="js/main.js" type="text/javascript"></script>
-        <script src="js/photonic3d.js" type="text/javascript"></script>
     </body>
 </html>
diff --git a/js/main.js b/js/main.js
@@ -514,7 +514,7 @@ function updateSlicerSettings() {
 
     getSlice($sliderInput.slider('getValue'));
 
-    updateSlicerUI();
+    updateSliderUI();
 }
 
 function flipGeometry() {
diff --git a/js/photonic3d.js b/js/photonic3d.js
@@ -1,76 +0,0 @@
-// Photonic3D Modifications and Features to SLAcer
-
-// Utils
-function findPythagoreanC(a, b) {
-	return Math.sqrt(Math.pow(a, 2) + Math.pow(b, 2));
-}
-
-function setPrinterCallibrationSettings(printer) {
-	// console.log(printer);
-	var slicingProfile = printer.configuration.slicingProfile;
-	var monitorDriverConfig = printer.configuration.machineConfig.MonitorDriverConfig;
-	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);
-
-	// $buildVolumeX.val(buildVolXmm);
-	// $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', {
-        size: {
-            x: buildVolXmm,
-            y: buildVolYmm,
-            z: $buildVolumeZ.val()
-        },
-        unit: unit
-    });
-    viewer3d.setBuildVolume(settings.get('buildVolume'));
-    updateBuildVolumeUI();
-
-
-	$('#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;
-	$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) {
-			XYerr = setPrinterCallibrationSettings(data);
-		}
-	});
-
-	if (XYerr) {
-		// Error handling
-	}
-}
-
-// $(window).bind('load', initializeValues);
-$(document).ready(initializeValues);
-// initializeValues();