Skip to content
Permalink
Browse files

- first console debugs

- slicing not working with wow
  • Loading branch information...
Fabian
Fabian committed Mar 1, 2018
1 parent 7b5f2c9 commit c598a92cef49e1adc067b80b70be74c8a6f7cad8
Showing with 29 additions and 6 deletions.
  1. +2 −1 index.html
  2. +27 −5 js/main.js
@@ -187,8 +187,9 @@ <h3 class="panel-title">Slicer</h3>

<div class="form-group">
<label for="slicer-image-extension">Output type</label>
<input type="radio" name="slicer-image-extension" id="slicer-image-extension-png" value="png" checked="checked" /> png
<input type="radio" name="slicer-image-extension" id="slicer-image-extension-png" value="png" /> png
<input type="radio" name="slicer-image-extension" id="slicer-image-extension-svg" value="svg" /> svg
<input type="radio" name="slicer-image-extension" id="slicer-image-extension-wow" value="wow" checked="checked" /> wow
</div>

<hr />
@@ -18,8 +18,9 @@ var settings = new SLAcer.Settings({
off: 500
},
zip: true,
wow: true,
svg: false,
png: true,
png: false,
speed: false,
speedDelay: 10, // ms
panel: {
@@ -63,8 +64,8 @@ var settings = new SLAcer.Settings({
}
},
screen: {
width : window.screen.width,
height : window.screen.height,
width : 854,//window.screen.width,
height : 480,//window.screen.height,
diagonal : { size: 4.6, unit: 'in' },
panel : {
collapsed: false,
@@ -187,6 +188,16 @@ function getSlice(layerNumber) {
var fileName = layerNumber + '.png';
var imgData = dataURL.substr(dataURL.indexOf(',') + 1);
zipFolder.file(fileName, imgData, { base64: true });
}else if (WOWExport) {
console.log('layer number:', layerNumber);
console.log('z position :', zPosition);
// console.log('faces', faces);
var imgData = dataURL.substr(dataURL.indexOf(',') + 1);
var data = imgData.data;
myLogger(data);
// TODO: remove (just to have a result)
var fileName = layerNumber + '.png';
zipFolder.file(fileName, imgData, { base64: true });
}
});

@@ -270,6 +281,12 @@ function getSlice(layerNumber) {
// add svg file to zip
zipFolder.file(layerNumber + '.svg', svg);
}

}
function myLogger(message){
return function(){
console.log(message);
}
}

// -----------------------------------------------------------------------------
@@ -470,6 +487,7 @@ var $slicerLiftingHeight = $slicerBody.find('#slicer-lifting-height');

var $slicerExportPNG = $slicerBody.find('#slicer-image-extension-png');
var $slicerExportSVG = $slicerBody.find('#slicer-image-extension-svg');
var $slicerExportWOW = $slicerBody.find('#slicer-image-extension-wow');

var $slicerSpeedYes = $slicerBody.find('#slicer-speed-yes');
var $slicerSpeedNo = $slicerBody.find('#slicer-speed-no');
@@ -502,6 +520,7 @@ function updateSlicerSettings() {

settings.set('slicer.png', $slicerExportPNG[0].checked);
settings.set('slicer.svg', $slicerExportSVG[0].checked);
settings.set('slicer.wow', $slicerExportWOW[0].checked);

settings.set('slicer.zip', $slicerMakeZipYes[0].checked);
settings.set('slicer.speed', $slicerSpeedYes[0].checked);
@@ -519,6 +538,7 @@ var slicesNumber;
var zipFile;
var zipFolder;

var WOWExport;
var SVGExport;
var PNGExport;

@@ -577,6 +597,7 @@ function startSlicing() {

zipFile = null;
zipFolder = null;
WOWExport = null;
SVGExport = null;
PNGExport = null;

@@ -585,7 +606,7 @@ function startSlicing() {
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: settings.get('slicer.png') ? 'png' : 'svg',
imageExtension: settings.get('slicer.png') ? 'png' : settings.get('slicer.svg') ? 'svg' : 'wow',
imageDirectory: 'slices',
screenWidth : settings.get('screen.width'),
screenHeight : settings.get('screen.height'),
@@ -597,6 +618,7 @@ function startSlicing() {
liftingSpeed : parseInt(settings.get('slicer.lifting.speed')), // mm/min
liftingHeight : parseInt(settings.get('slicer.lifting.height')) // mm
}, null, 2));
WOWExport = settings.get('slicer.wow')
SVGExport = settings.get('slicer.svg');
PNGExport = settings.get('slicer.png');
}
@@ -630,7 +652,7 @@ $abortButton.on('click', function(e) {
endSlicing();
});

$('#slicer-image-extension-' + (settings.get('slicer.png') ? 'png' : 'svg')).prop('checked', true);
$('#slicer-image-extension-' + (settings.get('slicer.png') ? 'png' : settings.get('slicer.svg') ? 'svg' : 'wow')).prop('checked', true);
$('#slicer-make-zip-' + (settings.get('slicer.zip') ? 'yes' : 'no')).prop('checked', true);
$('#slicer-speed-' + (settings.get('slicer.speed') ? 'yes' : 'no')).prop('checked', true);
$('#slicer input').on('input, change', updateSlicerSettings);

0 comments on commit c598a92

Please sign in to comment.
You can’t perform that action at this time.