vmario
/
doodle3d-client
mirror of https://github.com/Doodle3D/doodle3d-client.git
0
0
Fork 0
Code Issues Releases Wiki Activity

preparing image

This commit is contained in:
Rick Companje 2015-05-01 19:12:05 +02:00
parent e1a4e6b4bf
commit 4655e5609e
8 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -33,3 +33,7 @@ less/verticalshapes_backup.css
__settings.html
css/_settings.css
node_modules/*
*.tgz
*.tgz

4
Makefile
View File

@ -55,6 +55,7 @@ define Package/doodle3d-client/install
$(INSTALL_DIR) $(1)/www
$(INSTALL_DIR) $(1)/www/filemanager
$(INSTALL_DIR) $(1)/www/printmanager
$(INSTALL_DIR) $(1)/www/css
$(INSTALL_DIR) $(1)/www/img
#$(INSTALL_DIR) $(1)/www/js
@ -72,14 +73,17 @@ define Package/doodle3d-client/install
$(CP) $(PKG_BUILD_DIR)/www/img/* $(1)/www/img/
$(CP) $(PKG_BUILD_DIR)/www/filemanager/* $(1)/www/filemanager/
$(CP) $(PKG_BUILD_DIR)/www/printmanager/* $(1)/www/printmanager/
ifeq ($(CONFIG_DOODLE3D_CLIENT_MINIFY_JS),y)
$(CP) $(PKG_BUILD_DIR)/www/js/doodle3d-client.min.js $(1)/www/js/
$(CP) $(PKG_BUILD_DIR)/www/js/doodle3d-api.min.js $(1)/www/js/
else
#NOTE: if using a symlink here installation with openwrt make fails
# when trying to build with minification after package has been built
# without minification (dangling symlink breaks openwrt's final copy command)
$(CP) $(PKG_BUILD_DIR)/www/js/doodle3d-client.js $(1)/www/js/doodle3d-client.min.js
$(CP) $(PKG_BUILD_DIR)/www/js/doodle3d-api.js $(1)/www/js/doodle3d-api.min.js
#$(LN) -s /www/js/doodle3d-client.js $(1)/www/js/doodle3d-client.min.js
endif

6
js/Printer.js
View File

@ -19,6 +19,7 @@ function setPrintprogress(val) {
//*/
function Printer() {
var className = 'Printer';
Printer.WIFIBOX_DISCONNECTED_STATE = "wifibox disconnected";
Printer.UNKNOWN_STATE = "unknown"; // happens when a printer is connection but there isn't communication yet
@ -275,6 +276,11 @@ function Printer() {
}
this.checkStatus = function() {
if (limitedFeatures) {
return; //don't check printer status when in limitedFeatures mode
}
//console.log("Printer:checkStatus");
this.stateOverruled = false;
//console.log(" stateOverruled: ",this.stateOverruled);

2
js/api/SketchAPI.js
View File

@ -7,12 +7,14 @@
*/
function SketchAPI() {
var className = 'SketchAPI';
this.load = function(id,success,fail) {
API.get('sketch/?id='+id,success,fail);
}
this.save = function(data,success,fail) {
console.log(className,'saving sketch',data);
API.post('sketch',{data:data},success,fail);
}

2
js/previewRendering.js
View File

@ -16,7 +16,7 @@ var previewCtx_tmp;
var previewDefaults = {
rotation: 0, //Math.PI/90,
numLayers: 5, //was 10
numLayers: 1, //was 10
showTravelLines: false
}

10
js/settings/NetworkPanel.js
View File

@ -111,6 +111,10 @@ function NetworkPanel() {
_self.retrieveNetworkStatus(false);
}
this.refreshNetworks = function(completeHandler) {
if (limitedFeatures) {
return; //don't check printer status when in limitedFeatures mode
}
//console.log("NetworkPanel:refreshNetworks");
_api.scan(function(data) { // completed
//console.log("NetworkPanel:scanned");
@ -143,7 +147,13 @@ function NetworkPanel() {
};
this.retrieveNetworkStatus = function(connecting) {
if (limitedFeatures) {
return; //don't check network status when in limitedFeatures mode
}
//console.log("NetworkPanel:retrieveNetworkStatus");
_api.status(function(data) {
if(data.status === "") {
data.status = NetworkAPI.STATUS.CREATED.toString();

4
js/settings/UpdatePanel.js
View File

@ -136,6 +136,10 @@ function UpdatePanel() {
}
this.checkStatus = function(keepChecking) {
if (limitedFeatures) {
return; //don't check printer status when in limitedFeatures mode
}
if (!communicateWithWifibox) return;
$.ajax({
url: self.wifiboxURL + "/update/status",

2
www/printmanager/js/Doodle.js
View File

@ -36,7 +36,7 @@ var Doodle = function(svgData,settings) {
function getSvgFileData() {
return '<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 640 540">' +
'<path fill="none" stroke="black" stroke-width="2" d="' + getSvgPathDescription() +
'"></path><!--<![CD'+'ATA[d3d-keys {"height":5,"outlineShape":"none","twist":0}]]>--></svg>';
'"></path><!--<![CD'+'ATA[d3d-keys {"height":2,"outlineShape":"none","twist":0}]]>--></svg>';
}
function setFromSvgPathDescription(svgData) {