|
@@ -327,10 +327,12 @@ function parseUnit(value, unit) { |
|
|
// File panel
|
|
|
var $fileBody = initPanel('file');
|
|
|
var $fileInput = $fileBody.find('#file-input');
|
|
|
+var loadedFile = null;
|
|
|
|
|
|
$fileInput.on('change', function(e) {
|
|
|
resetTransformValues();
|
|
|
- loader.loadFile(e.target.files[0]);
|
|
|
+ loadedFile = e.target.files[0];
|
|
|
+ loader.loadFile(loadedFile);
|
|
|
});
|
|
|
|
|
|
// Mesh panel
|
|
@@ -494,27 +496,31 @@ function startSlicing() { |
|
|
zipFile = new JSZip();
|
|
|
zipFolder = zipFile.folder('slices');
|
|
|
zipFile.file("README.txt", 'Generated by SLAcer.js\r\nhttp://lautr3k.github.io/SLAcer.js/\r\n');
|
|
|
- // zipFile.file("slacer.json", JSON.stringify({
|
|
|
- // imageExtension: '.png',
|
|
|
- // imageDirectory: 'slices',
|
|
|
- // screenWidth : settings.get('screen.width'),
|
|
|
- // screenHeight : settings.get('screen.height'),
|
|
|
- // screenSize : settings.get('screen.diagonal.size'),
|
|
|
- // screenUnit : settings.get('screen.diagonal.unit'),
|
|
|
- // layersNumber : slicesNumber,
|
|
|
- // layersHeight : settings.get('slicer.layers.height') / 1000, // mm
|
|
|
- // exposureTime : parseInt(settings.get('slicer.light.on')), // ms
|
|
|
- // liftingSpeed : parseInt(settings.get('slicer.lifting.speed')), // mm/min
|
|
|
- // liftingHeight : parseInt(settings.get('slicer.lifting.height')) // mm
|
|
|
- // }, null, 2));
|
|
|
+ zipFile.file("slacer.json", JSON.stringify({
|
|
|
+ imageExtension: '.png',
|
|
|
+ imageDirectory: 'slices',
|
|
|
+ screenWidth : settings.get('screen.width'),
|
|
|
+ screenHeight : settings.get('screen.height'),
|
|
|
+ screenSize : settings.get('screen.diagonal.size'),
|
|
|
+ screenUnit : settings.get('screen.diagonal.unit'),
|
|
|
+ layersNumber : slicesNumber,
|
|
|
+ layersHeight : settings.get('slicer.layers.height') / 1000, // mm
|
|
|
+ exposureTime : parseInt(settings.get('slicer.light.on')), // ms
|
|
|
+ liftingSpeed : parseInt(settings.get('slicer.lifting.speed')), // mm/min
|
|
|
+ liftingHeight : parseInt(settings.get('slicer.lifting.height')) // mm
|
|
|
+ }, null, 2));
|
|
|
}
|
|
|
|
|
|
slicesNumber && slice();
|
|
|
}
|
|
|
|
|
|
$zipButton.on('click', function(e) {
|
|
|
if (zipFile) {
|
|
|
- saveAs(zipFile.generate({type: 'blob'}), 'SLAcer.zip');
|
|
|
+ var name = 'SLAcer';
|
|
|
+ if (loadedFile && loadedFile.name) {
|
|
|
+ name = loadedFile.name;
|
|
|
+ }
|
|
|
+ saveAs(zipFile.generate({type: 'blob'}), name + '.zip');
|
|
|
}
|
|
|
});
|
|
|
|
|
|
0 comments on commit
4abdcb5