vmario/doodle3d-client
0
0
Fork 0
mirror of https://github.com/Doodle3D/doodle3d-client.git synced 2024-06-02 04:34:32 +02:00
Code Issues Releases Wiki Activity

A little less code duplication

Browse Source
This commit is contained in:
peteruithoven 2013-10-28 01:26:58 +01:00
parent 96a48b38d9
commit f783726c47
2 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
js_src/SettingsWindow.js
View File

@ -310,16 +310,24 @@ function SettingsWindow() {
this.printerSelectorChanged = function(e) { this.printerSelectorChanged = function(e) {
var selectedOption = self.printerSelector.find("option:selected"); var selectedOption = self.printerSelector.find("option:selected");
switch(selectedOption.val()) { if(self.isMarlinPrinter(selectedOption.val())) {
self.x3gSettings.hide();
self.gcodeSettings.show();
} else {
self.gcodeSettings.hide();
self.x3gSettings.show();
}
}
this.isMarlinPrinter = function(printer) {
switch(printer) {
case "makerbot_generic": case "makerbot_generic":
case "makerbot_replicator2": case "makerbot_replicator2":
case "makerbot_thingomatic": case "makerbot_thingomatic":
self.gcodeSettings.hide(); return false;
self.x3gSettings.show();
break; break;
default: default:
self.x3gSettings.hide(); return true;
self.gcodeSettings.show();
break; break;
} }
} }

19
js_src/gcodeGenerating.js
View File

@ -65,19 +65,14 @@ function generate_gcode() {
var startCode = ""; var startCode = "";
var endCode = ""; var endCode = "";
switch(printerType) { if(settingsWindow.isMarlinPrinter(printerType)) {
case "makerbot_generic": startCode = settings["printer.startcode.marlin"];
case "makerbot_replicator2": endCode = settings["printer.endcode.marlin"];
case "makerbot_thingomatic": } else {
startCode = settings["printer.startcode.x3g"]; startCode = settings["printer.startcode.x3g"];
endCode = settings["printer.endcode.x3g"]; endCode = settings["printer.endcode.x3g"];
break;
default:
startCode = settings["printer.startcode.marlin"];
endCode = settings["printer.endcode.marlin"];
break;
} }
startCode = subsituteVariables(startCode,temperature,bedTemperature,preheatTemperature,preheatBedTemperature); startCode = subsituteVariables(startCode,temperature,bedTemperature,preheatTemperature,preheatBedTemperature);
startCode = startCode.split("\n"); startCode = startCode.split("\n");