vmario/doodle3d-connect
0
0
Fork 0
mirror of https://github.com/Doodle3D/doodle3d-connect.git synced 2024-12-26 02:23:48 +01:00
Code Issues Releases Wiki Activity

print page getting ready

Browse Source
This commit is contained in:
Rick Companje 2017-07-12 11:39:26 +02:00
parent 10b6a41578
commit 3362c03136
1 changed files with 92 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
js/PrintPage.js
View File

@ -39,12 +39,16 @@
_connectAPI.list(function(successData) { _connectAPI.list(function(successData) {
console.log("_connectAPI.list success",successData); console.log("_connectAPI.list success",successData);
$("#lstBoxes").empty(); $("#lstBoxes").empty();
$("#lstBoxes").append($("<option/>")); $("#lstBoxes").append($("<option></option>"));
var selectedItem;
for (var i in successData) { for (var i in successData) {
var box = successData[i]; var box = successData[i];
var selected = (box.localip===_pageData.localip) ? "selected " : ""; var selected = (box.localip===_pageData.localip) ? "selected " : "";
if (selected) {
selectedItem = _pageData.localip;
}
$("#lstBoxes").append($("<option "+selected+" value="+box.localip+">"+box.wifiboxid+"</option>")); $("#lstBoxes").append($("<option "+selected+" value="+box.localip+">"+box.wifiboxid+"</option>"));
} }
@ -52,8 +56,8 @@
$("#lstBoxes").selectmenu("refresh", true); $("#lstBoxes").selectmenu("refresh", true);
if (_pageData.localip) { if (selectedItem) {
onSelectWiFiBox(_pageData.localip); onSelectWiFiBox(selectedItem);
} }
}, function(failData) { }, function(failData) {
@ -119,41 +123,73 @@
} }
} }
function print() { function checkPrinterTypeMatch(completeHandler, failedHandler) {
_configAPI.loadAll(function(successData) { _configAPI.loadAll(function(successData) {
_wifiboxSettings = successData; _wifiboxSettings = successData;
var slicerPrinterType = _slicerSettings.type;
var wifiboxPrinterType = _wifiboxSettings["printer.type"];
if (slicerPrinterType!==wifiboxPrinterType) { var data = {
var override = window.confirm("The GCODE file was sliced for '"+slicerPrinterType+"'.\n"+ slicerPrinterType: _slicerSettings.printer.type,
"Your WiFi-Box is currently configured for '"+wifiboxPrinterType+"'\n\n"+ wifiboxPrinterType: _wifiboxSettings["printer.type"]
};
if (data.slicerPrinterType === data.wifiboxPrinterType) {
if (completeHandler) {
completeHandler(data);
}
} else {
if (failedHandler) {
failedHandler(data);
}
}
});
}
function forcePrinterTypeMatch(completeHandler, failedHandler) {
checkPrinterTypeMatch(function(successData) {
completeHandler({msg:"slicerPrinterType matches wifiboxPrinterType"});
}, function(failData) {
var override = window.confirm("The GCODE file was sliced for '"+failData.slicerPrinterType+"'.\n"+
"Your WiFi-Box is currently configured for '"+failData.wifiboxPrinterType+"'\n\n"+
"Do you want to override the settings on your WiFi-Box with the new settings from the slicer?"); "Do you want to override the settings on your WiFi-Box with the new settings from the slicer?");
if (override) { if (override) {
// _configAPI.savePrinterType(failData.slicerPrinterType, function(successData) {
_configAPI.savePrinterType(slicerPrinterType,function(successData) {
console.log(successData); //reload settings from WiFi-Box with new printerType to get the right start & end gcode
window.alert(successData.validation["printer.type"] + " (printer.type)"); _configAPI.loadAll(function(successData) {
},function(failData) { _wifiboxSettings = successData;
window.alert("Could not save printer type '",slicerPrinterType,"')' to WiFi-Box"); completeHandler({msg:"printer.type successfully updated and _wifiboxSettings successfully reloaded"});
}, function(failData) {
failedHandler({msg:"reload config failed"});
}); });
}
}, function(failData) {
failedHandler({msg:"saving failed printer.type failed",details:failData});
});
} else {
failedHandler({msg:"Please use the settings from Slicer."});
} }
}); });
if (true) {
return;
} }
//var startcode = _configAPI.subsituteVariables(_wifiboxSettings["printer.startcode"],_wifiboxSettings); function print() {
//var endcode = _configAPI.subsituteVariables(_wifiboxSettings["printer.endcode"],_wifiboxSettings); console.log("print");
forcePrinterTypeMatch(function(successData) {
console.log("successfully made sure printerType and config is up to date",successData);
var startcode = _configAPI.subsituteVariables(_wifiboxSettings["printer.startcode"],_wifiboxSettings);
var endcode = _configAPI.subsituteVariables(_wifiboxSettings["printer.endcode"],_wifiboxSettings);
var data = { var data = {
"id": d3d.pageParams.uuid, "id": d3d.pageParams.uuid,
// "start_code": startcode, "start_code": startcode,
// "end_code": endcode "end_code": endcode
}; };
//console.log("fetchPrint",d3d.pageParams.uuid,data); //console.log("fetchPrint",d3d.pageParams.uuid,data);
@ -167,6 +203,14 @@
console.log("fetchPrint fail",failData); console.log("fetchPrint fail",failData);
window.alert("Problem: " + failData.msg); window.alert("Problem: " + failData.msg);
}); });
},function(failData) {
window.alert("Sorry, the print can not be started because the settings don't match between the Slicer and the WiFi-Box.\n\nDetails: " + failData.msg);
});
} }
function clearInfo() { function clearInfo() {
@ -187,10 +231,11 @@
console.log("_serverAPI fetchHeader success",successData); console.log("_serverAPI fetchHeader success",successData);
var header = successData; var header = successData;
_slicerSettings = header; //copy header json data into _slicerSettings _slicerSettings = header; //copy header json data into _slicerSettings
var printerId = header.type; var printerId = header.printer.type;
var printerTitle = header.printer.title;
$("#infoFile").text(header.name + " (" + filesize + ")"); $("#infoFile").text(header.name + " (" + filesize + ")");
$("#infoPrinter").text(printerId); $("#infoPrinter").text(printerTitle);
$("#infoMaterial").html(header.filamentThickness + "mm @ " + header.temperature + "&deg;C"); $("#infoMaterial").html(header.filamentThickness + "mm @ " + header.temperature + "&deg;C");
$("#iconPrinter").attr('src','img/icons/printers/'+printerId+'.png'); $("#iconPrinter").attr('src','img/icons/printers/'+printerId+'.png');