mirror of
https://github.com/Doodle3D/doodle3d-client.git
synced 2025-04-19 19:06:25 +02:00
preparing image
This commit is contained in:
parent
e1a4e6b4bf
commit
4655e5609e
4
.gitignore
vendored
4
.gitignore
vendored
@ -33,3 +33,7 @@ less/verticalshapes_backup.css
|
|||||||
__settings.html
|
__settings.html
|
||||||
css/_settings.css
|
css/_settings.css
|
||||||
node_modules/*
|
node_modules/*
|
||||||
|
|
||||||
|
*.tgz
|
||||||
|
|
||||||
|
*.tgz
|
||||||
|
4
Makefile
4
Makefile
@ -55,6 +55,7 @@ define Package/doodle3d-client/install
|
|||||||
|
|
||||||
$(INSTALL_DIR) $(1)/www
|
$(INSTALL_DIR) $(1)/www
|
||||||
$(INSTALL_DIR) $(1)/www/filemanager
|
$(INSTALL_DIR) $(1)/www/filemanager
|
||||||
|
$(INSTALL_DIR) $(1)/www/printmanager
|
||||||
$(INSTALL_DIR) $(1)/www/css
|
$(INSTALL_DIR) $(1)/www/css
|
||||||
$(INSTALL_DIR) $(1)/www/img
|
$(INSTALL_DIR) $(1)/www/img
|
||||||
#$(INSTALL_DIR) $(1)/www/js
|
#$(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/img/* $(1)/www/img/
|
||||||
$(CP) $(PKG_BUILD_DIR)/www/filemanager/* $(1)/www/filemanager/
|
$(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)
|
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-client.min.js $(1)/www/js/
|
||||||
|
$(CP) $(PKG_BUILD_DIR)/www/js/doodle3d-api.min.js $(1)/www/js/
|
||||||
else
|
else
|
||||||
#NOTE: if using a symlink here installation with openwrt make fails
|
#NOTE: if using a symlink here installation with openwrt make fails
|
||||||
# when trying to build with minification after package has been built
|
# when trying to build with minification after package has been built
|
||||||
# without minification (dangling symlink breaks openwrt's final copy command)
|
# 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-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
|
#$(LN) -s /www/js/doodle3d-client.js $(1)/www/js/doodle3d-client.min.js
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
@ -19,6 +19,7 @@ function setPrintprogress(val) {
|
|||||||
//*/
|
//*/
|
||||||
|
|
||||||
function Printer() {
|
function Printer() {
|
||||||
|
var className = 'Printer';
|
||||||
|
|
||||||
Printer.WIFIBOX_DISCONNECTED_STATE = "wifibox disconnected";
|
Printer.WIFIBOX_DISCONNECTED_STATE = "wifibox disconnected";
|
||||||
Printer.UNKNOWN_STATE = "unknown"; // happens when a printer is connection but there isn't communication yet
|
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() {
|
this.checkStatus = function() {
|
||||||
|
|
||||||
|
if (limitedFeatures) {
|
||||||
|
return; //don't check printer status when in limitedFeatures mode
|
||||||
|
}
|
||||||
|
|
||||||
//console.log("Printer:checkStatus");
|
//console.log("Printer:checkStatus");
|
||||||
this.stateOverruled = false;
|
this.stateOverruled = false;
|
||||||
//console.log(" stateOverruled: ",this.stateOverruled);
|
//console.log(" stateOverruled: ",this.stateOverruled);
|
||||||
|
@ -7,12 +7,14 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
function SketchAPI() {
|
function SketchAPI() {
|
||||||
|
var className = 'SketchAPI';
|
||||||
|
|
||||||
this.load = function(id,success,fail) {
|
this.load = function(id,success,fail) {
|
||||||
API.get('sketch/?id='+id,success,fail);
|
API.get('sketch/?id='+id,success,fail);
|
||||||
}
|
}
|
||||||
|
|
||||||
this.save = function(data,success,fail) {
|
this.save = function(data,success,fail) {
|
||||||
|
console.log(className,'saving sketch',data);
|
||||||
API.post('sketch',{data:data},success,fail);
|
API.post('sketch',{data:data},success,fail);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -16,7 +16,7 @@ var previewCtx_tmp;
|
|||||||
|
|
||||||
var previewDefaults = {
|
var previewDefaults = {
|
||||||
rotation: 0, //Math.PI/90,
|
rotation: 0, //Math.PI/90,
|
||||||
numLayers: 5, //was 10
|
numLayers: 1, //was 10
|
||||||
showTravelLines: false
|
showTravelLines: false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -111,6 +111,10 @@ function NetworkPanel() {
|
|||||||
_self.retrieveNetworkStatus(false);
|
_self.retrieveNetworkStatus(false);
|
||||||
}
|
}
|
||||||
this.refreshNetworks = function(completeHandler) {
|
this.refreshNetworks = function(completeHandler) {
|
||||||
|
if (limitedFeatures) {
|
||||||
|
return; //don't check printer status when in limitedFeatures mode
|
||||||
|
}
|
||||||
|
|
||||||
//console.log("NetworkPanel:refreshNetworks");
|
//console.log("NetworkPanel:refreshNetworks");
|
||||||
_api.scan(function(data) { // completed
|
_api.scan(function(data) { // completed
|
||||||
//console.log("NetworkPanel:scanned");
|
//console.log("NetworkPanel:scanned");
|
||||||
@ -143,7 +147,13 @@ function NetworkPanel() {
|
|||||||
};
|
};
|
||||||
|
|
||||||
this.retrieveNetworkStatus = function(connecting) {
|
this.retrieveNetworkStatus = function(connecting) {
|
||||||
|
|
||||||
|
if (limitedFeatures) {
|
||||||
|
return; //don't check network status when in limitedFeatures mode
|
||||||
|
}
|
||||||
|
|
||||||
//console.log("NetworkPanel:retrieveNetworkStatus");
|
//console.log("NetworkPanel:retrieveNetworkStatus");
|
||||||
|
|
||||||
_api.status(function(data) {
|
_api.status(function(data) {
|
||||||
if(data.status === "") {
|
if(data.status === "") {
|
||||||
data.status = NetworkAPI.STATUS.CREATED.toString();
|
data.status = NetworkAPI.STATUS.CREATED.toString();
|
||||||
|
@ -136,6 +136,10 @@ function UpdatePanel() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
this.checkStatus = function(keepChecking) {
|
this.checkStatus = function(keepChecking) {
|
||||||
|
if (limitedFeatures) {
|
||||||
|
return; //don't check printer status when in limitedFeatures mode
|
||||||
|
}
|
||||||
|
|
||||||
if (!communicateWithWifibox) return;
|
if (!communicateWithWifibox) return;
|
||||||
$.ajax({
|
$.ajax({
|
||||||
url: self.wifiboxURL + "/update/status",
|
url: self.wifiboxURL + "/update/status",
|
||||||
|
@ -36,7 +36,7 @@ var Doodle = function(svgData,settings) {
|
|||||||
function getSvgFileData() {
|
function getSvgFileData() {
|
||||||
return '<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 640 540">' +
|
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 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) {
|
function setFromSvgPathDescription(svgData) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user