vmario/doodle3d-client
0
0
Fork 0
mirror of https://github.com/Doodle3D/doodle3d-client.git synced 2025-06-11 17:23:17 +02:00
Code Issues Releases Wiki Activity

Settings improvements

Browse Source
This commit is contained in:
peteruithoven
2013-08-28 18:33:25 +02:00
parent c15c023829
commit 2deec18072
5 changed files with 140 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
js/SettingsWindow.js
View File

@ -57,6 +57,7 @@ function SettingsWindow() {
self.saveSettings();
self.hideSettings();
}
this.showSettings = function() {
console.log("f:showSettings()");
@ -71,6 +72,7 @@ function SettingsWindow() {
document.body.addEventListener('touchmove',prevent,false);
});
}
this.loadSettings = function() {
if (!communicateWithWifibox) {
console.log(" communicateWithWifibox is false: settings aren't being loaded from wifibox...")
@ -96,6 +98,7 @@ function SettingsWindow() {
self.retryLoadSettingsDelay = setTimeout(function() { self.loadSettings() },self.retryDelay); // retry after delay
});
}
this.saveSettings = function(callback) {
console.log("Settings:saveSettings");
@ -103,12 +106,13 @@ function SettingsWindow() {
$("#printersettings input").each( function(index,element) {
var element = $(element);
//populate settings are with values from html
if(element.attr("type") == "text") {
if(element.attr("type") == "text" || element.attr("type") == "number") {
settings[element.attr('name')] = element.val();
} else if(element.attr("type") == "checkbox") {
settings[element.attr('name')] = element.prop('checked')
}
});
this.readForm();
if (communicateWithWifibox) {
$.ajax({
@ -142,22 +146,58 @@ function SettingsWindow() {
});
}
}
this.fillForm = function() {
//update html with loaded wifi settings
$("#ipaddress").attr('value', settings["network.ap.address"]);
$("#netmask").attr('value', settings["network.ap.netmask"]);
$("#ssid").attr('value', settings["network.ap.ssid"]);
//update html with loaded printer settings
$("#printersettings input").each( function(index,element) {
console.log("SettingsWindow:fillForm");
//fill form with loaded settings
var selects = this.form.find("select");
selects.each( function(index,element) {
var element = $(element);
element.val(settings[element.attr('name')]);
});
var inputs = this.form.find("input");
inputs.each( function(index,element) {
var element = $(element);
//console.log("printer setting input: ",index,element.attr("type"),element.attr('name')); //,element);
if(element.attr("type") == "text") {
element.val(settings[element.attr('name')]);
} else if(element.attr("type") == "checkbox") {
element.prop('checked', settings[element.attr('name')]);
switch(element.attr("type")) {
case "text":
case "number":
element.val(settings[element.attr('name')]);
break;
case "checkbox":
element.prop('checked', settings[element.attr('name')]);
break;
}
});
// TODO: textarea's
var textareas = this.form.find("textarea");
console.log(textareas);
textareas.each( function(index,element) {
var element = $(element);
console.log("printer setting textarea: ",index,element.attr('name')); //,element);
var value = settings[element.attr('name')];
element.val(value);
console.log(" value: ",value);
});
}
this.readForm = function() {
console.log("SettingsWindow:readForm");
// read settings from form
// TODO: textarea's
var textareas = this.form.find("textarea");
console.log(textareas);
textareas.each( function(index,element) {
var element = $(element);
console.log("printer textarea: ",index,element.attr('name')); //,element);
console.log(" val: ",element.val());
settings[element.attr('name')] = element.val();
});
console.log(settings);
}
}

2
js/canvasDrawing_v01.js
View File

@ -301,7 +301,7 @@ function onCanvasMouseMove(e) {
if (prevPoint.x != -1 || prevPoint.y != -1) {
var dist = Math.sqrt(Math.pow((prevPoint.x - x), 2) + Math.pow((prevPoint.y - y), 2));
if (dist > 5) {
if (dist > 5) { // replace by setting: doodle3d.simplify.minDistance
_points.push([x, y, false]);
adjustBounds(x, y)
adjustPreviewTransformation();