Change way of presetting callibration settings

lautr3k · cedb31063ca4f15d1b5919e59090814320499797 · wilbur-shi committed Aug 4, 2016 · Aug 4, 2016 · cedb310
1 parent 2acf3f2
commit cedb31063ca4f15d1b5919e59090814320499797
Unified Split

Showing with 24 additions and 7 deletions.

+3 −1 js/main.js

+21 −6 js/photonic3d.js
diff --git a/js/main.js b/js/main.js
@@ -695,7 +695,7 @@ function updateBuildVolumeSettings() {
     });
 
     viewer3d.setBuildVolume(settings.get('buildVolume'));
-    slicer.mesh && viewer3d.dropObject(slicer.mesh);
+    viewer3d.dropObject(slicer.mesh);
     viewer3d.render();
 
     size && updateMeshInfoUI();
@@ -1066,3 +1066,5 @@ xmlhttp.onreadystatechange = function() {
 }
 
 xmlhttp.send();
+
+
diff --git a/js/photonic3d.js b/js/photonic3d.js
@@ -17,14 +17,29 @@ function setPrinterCallibrationSettings(printer) {
 	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();
+	// $buildVolumeX.val(buildVolXmm);
+	// $buildVolumeY.val(buildVolYmm);
+	// updateBuildVolumeSettings();
+    
+    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();
 }
 
 // Initialize values
@@ -40,6 +55,6 @@ function initializeValues() {
 	});
 }
 
-$(window).bind('load', initializeValues);
-// $(document).ready(initializeValues);
-// initializeValues();
+// $(window).bind('load', initializeValues);
+$(document).ready(initializeValues);
+// initializeValues();