Merge pull request #1 from wilbur-shi/gh-pages

Merge SLAcer with Angela
lautr3k · Aug 4, 2016 · 51ecb87cf7a41c809f557ca0039c27a431394775 · 51ecb87
2 parents b735d12 + 2acf3f2
commit 51ecb87cf7a41c809f557ca0039c27a431394775
Unified Split

Showing with 50 additions and 3 deletions.

+1 −0 index.html

+4 −3 js/main.js

+45 −0 js/photonic3d.js
diff --git a/index.html b/index.html
@@ -359,5 +359,6 @@ <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'));
 
-    updateSliderUI();
+    updateSlicerUI();
 }
 
 function flipGeometry() {
@@ -695,7 +695,7 @@ function updateBuildVolumeSettings() {
     });
 
     viewer3d.setBuildVolume(settings.get('buildVolume'));
-    viewer3d.dropObject(slicer.mesh);
+    slicer.mesh && viewer3d.dropObject(slicer.mesh);
     viewer3d.render();
 
     size && updateMeshInfoUI();
@@ -1046,7 +1046,8 @@ var stl = 'stl/StressTest.stl';
 //var stl = 'stl/SLAcer.stl';
 
 // File url
-var url = 'http://' + window.location.hostname + window.location.pathname + stl;
+// var url = 'http://' + window.location.hostname + window.location.pathname + stl;
+var url = window.location.href + stl;
 
 // Create http request object
 var xmlhttp = new XMLHttpRequest();

diff --git a/js/photonic3d.js b/js/photonic3d.js
@@ -0,0 +1,45 @@
+// 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 dotsPermmXYAverage = (slicingProfile.DotsPermmX + slicingProfile.DotsPermmY) / 2;
+	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();
+
+	$('#screen-diagonal-unit-in').prop('checked', false);
+	$('#screen-diagonal-unit-mm').prop('checked', true);
+	$screenDiagonalSize.val(diagonalMM);
+
+}
+
+// Initialize values
+function initializeValues() {
+	$slicerSpeedYes[0].checked = true;
+	$slicerSpeedNo[0].checked = false;
+	updateSlicerSettings();
+
+	var printer = $.get( "/services/printers/getFirstAvailablePrinter", function( data ) {
+		if (data !== null && data !== undefined) {
+			setPrinterCallibrationSettings(data);
+		}
+	});
+}
+
+$(window).bind('load', initializeValues);
+// $(document).ready(initializeValues);
+// initializeValues();