From e3f49c2fb5bb5e4c4b2e6cbaee2c05e7ea928f19 Mon Sep 17 00:00:00 2001 From: QIDI TECH <893239786@qq.com> Date: Fri, 1 Aug 2025 14:48:54 +0800 Subject: [PATCH] update resources --- resources/cert/printer.cer | 90 +++++++++- resources/images/add_copies.svg | 1 + resources/images/ams_drying.svg | 3 + resources/images/ams_is_drying.svg | 3 + resources/images/toolbar_measure.svg | 102 ++--------- resources/images/toolbar_measure_dark.svg | 102 ++--------- resources/info/nozzle_incompatibles.json | 34 ++++ ....06mm High Quality @Q1 Pro 0.2 nozzle.json | 2 + .../0.06mm Standard @Q1 Pro 0.2 nozzle.json | 2 + .../process/0.08mm Extra Fine @Q1 Pro.json | 2 + ....08mm High Quality @Q1 Pro 0.2 nozzle.json | 2 + .../process/0.08mm High Quality @Q1 Pro.json | 2 + .../0.08mm Standard @Q1 Pro 0.2 nozzle.json | 2 + ....10mm High Quality @Q1 Pro 0.2 nozzle.json | 2 + .../0.10mm Standard @Q1 Pro 0.2 nozzle.json | 2 + .../Q Series/process/0.12mm Fine @Q1 Pro.json | 2 + .../process/0.12mm High Quality @Q1 Pro.json | 2 + .../0.12mm Standard @Q1 Pro 0.2 nozzle.json | 2 + .../0.14mm Standard @Q1 Pro 0.2 nozzle.json | 2 + .../process/0.16mm High Quality @Q1 Pro.json | 2 + .../process/0.16mm Optimal @Q1 Pro.json | 2 + .../0.18mm Standard @Q1 Pro 0.6 nozzle.json | 2 + .../process/0.24mm Draft @Q1 Pro.json | 2 + .../0.24mm Standard @Q1 Pro 0.6 nozzle.json | 2 + .../0.24mm Standard @Q1 Pro 0.8 nozzle.json | 2 + .../0.30mm Standard @Q1 Pro 0.6 nozzle.json | 2 + .../0.30mm Strength @Q1 Pro 0.6 nozzle.json | 2 + .../0.32mm Standard @Q1 Pro 0.8 nozzle.json | 2 + .../0.36mm Standard @Q1 Pro 0.6 nozzle.json | 2 + .../0.40mm Standard @Q1 Pro 0.8 nozzle.json | 2 + .../0.42mm Standard @Q1 Pro 0.6 nozzle.json | 2 + .../0.48mm Standard @Q1 Pro 0.8 nozzle.json | 2 + .../0.56mm Standard @Q1 Pro 0.8 nozzle.json | 2 + .../Q Series/process/fdm_process_common.json | 48 ++++++ ...0.06mm High Quality @XMax3 0.2 nozzle.json | 2 + ....06mm High Quality @XPlus3 0.2 nozzle.json | 2 + ...06mm High Quality @XSmart3 0.2 nozzle.json | 2 + .../0.06mm Standard @XMax3 0.2 nozzle.json | 2 + .../0.06mm Standard @XPlus3 0.2 nozzle.json | 2 + .../0.06mm Standard @XSmart3 0.2 nozzle.json | 2 + ...0.08mm High Quality @XMax3 0.2 nozzle.json | 2 + ....08mm High Quality @XPlus3 0.2 nozzle.json | 2 + ...08mm High Quality @XSmart3 0.2 nozzle.json | 2 + .../0.08mm Standard @XMax3 0.2 nozzle.json | 2 + .../0.08mm Standard @XPlus3 0.2 nozzle.json | 2 + .../0.08mm Standard @XSmart3 0.2 nozzle.json | 2 + ...0.10mm High Quality @XMax3 0.2 nozzle.json | 2 + ....10mm High Quality @XPlus3 0.2 nozzle.json | 2 + ...10mm High Quality @XSmart3 0.2 nozzle.json | 2 + .../0.10mm Standard @XMax3 0.2 nozzle.json | 2 + .../0.10mm Standard @XPlus3 0.2 nozzle.json | 2 + .../0.10mm Standard @XSmart3 0.2 nozzle.json | 2 + .../0.12mm Standard @XMax3 0.2 nozzle.json | 2 + .../0.12mm Standard @XPlus3 0.2 nozzle.json | 2 + .../0.12mm Standard @XSmart3 0.2 nozzle.json | 2 + .../0.14mm Standard @XMax3 0.2 nozzle.json | 2 + .../0.14mm Standard @XPlus3 0.2 nozzle.json | 2 + .../0.14mm Standard @XSmart3 0.2 nozzle.json | 2 + .../0.18mm Standard @XMax3 0.6 nozzle.json | 2 + .../0.18mm Standard @XPlus3 0.6 nozzle.json | 2 + .../0.18mm Standard @XSmart3 0.6 nozzle.json | 2 + .../0.24mm Standard @XMax3 0.6 nozzle.json | 2 + .../0.24mm Standard @XMax3 0.8 nozzle.json | 2 + .../0.24mm Standard @XPlus3 0.6 nozzle.json | 2 + .../0.24mm Standard @XPlus3 0.8 nozzle.json | 2 + .../0.24mm Standard @XSmart3 0.6 nozzle.json | 2 + .../0.24mm Standard @XSmart3 0.8 nozzle.json | 2 + .../0.30mm Standard @XMax3 0.6 nozzle.json | 2 + .../0.30mm Standard @XPlus3 0.6 nozzle.json | 2 + .../0.30mm Standard @XSmart3 0.6 nozzle.json | 2 + .../0.30mm Strength @XMax3 0.6 nozzle.json | 2 + .../0.30mm Strength @XPlus3 0.6 nozzle.json | 2 + .../0.30mm Strength @XSmart3 0.6 nozzle.json | 2 + .../0.32mm Standard @XMax3 0.8 nozzle.json | 2 + .../0.32mm Standard @XPlus3 0.8 nozzle.json | 2 + .../0.32mm Standard @XSmart3 0.8 nozzle.json | 2 + .../0.36mm Standard @XMax3 0.6 nozzle.json | 2 + .../0.36mm Standard @XPlus3 0.6 nozzle.json | 2 + .../0.36mm Standard @XSmart3 0.6 nozzle.json | 2 + .../0.40mm Standard @XMax3 0.8 nozzle.json | 2 + .../0.40mm Standard @XPlus3 0.8 nozzle.json | 2 + .../0.40mm Standard @XSmart3 0.8 nozzle.json | 2 + .../0.42mm Standard @XMax3 0.6 nozzle.json | 2 + .../0.42mm Standard @XPlus3 0.6 nozzle.json | 2 + .../0.42mm Standard @XSmart3 0.6 nozzle.json | 2 + .../0.48mm Standard @XMax3 0.8 nozzle.json | 2 + .../0.48mm Standard @XPlus3 0.8 nozzle.json | 2 + .../0.48mm Standard @XSmart3 0.8 nozzle.json | 2 + .../0.56mm Standard @XMax3 0.8 nozzle.json | 2 + .../0.56mm Standard @XPlus3 0.8 nozzle.json | 2 + .../0.56mm Standard @XSmart3 0.8 nozzle.json | 2 + .../process/fdm_process_common.json | 48 ++++++ .../X 4 Series/filament/QIDI PETG Tough.json | 2 +- .../machine/Qidi X-Plus 4 0.4 nozzle.json | 4 +- .../machine/fdm_machine_x_common.json | 2 +- ....06mm High Quality @XPlus4 0.2 nozzle.json | 2 + .../0.06mm Standard @XPlus4 0.2 nozzle.json | 2 + ....08mm High Quality @XPlus4 0.2 nozzle.json | 2 + .../0.08mm Standard @XPlus4 0.2 nozzle.json | 2 + ....10mm High Quality @XPlus4 0.2 nozzle.json | 2 + .../0.10mm Standard @XPlus4 0.2 nozzle.json | 2 + .../0.12mm Standard @XPlus4 0.2 nozzle.json | 2 + .../0.14mm Standard @XPlus4 0.2 nozzle.json | 2 + .../0.18mm Standard @XPlus4 0.6 nozzle.json | 2 + .../0.24mm Standard @XPlus4 0.6 nozzle.json | 2 + .../0.24mm Standard @XPlus4 0.8 nozzle.json | 2 + .../0.30mm Standard @XPlus4 0.6 nozzle.json | 2 + .../0.30mm Strength @XPlus4 0.6 nozzle.json | 2 + .../0.32mm Standard @XPlus4 0.8 nozzle.json | 2 + .../0.36mm Standard @XPlus4 0.6 nozzle.json | 2 + .../0.40mm Standard @XPlus4 0.8 nozzle.json | 2 + .../0.42mm Standard @XPlus4 0.6 nozzle.json | 2 + .../0.48mm Standard @XPlus4 0.8 nozzle.json | 2 + .../0.56mm Standard @XPlus4 0.8 nozzle.json | 2 + .../process/fdm_process_common.json | 48 ++++++ resources/shaders/110/gouraud.fs | 11 ++ resources/shaders/110/hotbed.fs | 15 +- resources/shaders/110/imgui.fs | 4 +- resources/shaders/140/gouraud.fs | 11 ++ resources/shaders/140/hotbed.fs | 15 +- resources/shaders/140/imgui.fs | 4 +- resources/web/data/text.js | 142 +++++++-------- resources/web/homepage3/css/common.css | 14 ++ resources/web/homepage3/css/dark.css | 13 ++ resources/web/homepage3/css/left.css | 161 +++++++++++++++--- resources/web/homepage3/css/left_mini.css | 11 +- resources/web/homepage3/img/i2.png | Bin 6133 -> 0 bytes resources/web/homepage3/img/i2.svg | 4 + .../web/homepage3/img/left_home_account.svg | 10 ++ resources/web/homepage3/img/left_library.svg | 6 + resources/web/homepage3/img/left_link.svg | 3 + .../web/homepage3/img/left_logout_icon.svg | 4 + resources/web/homepage3/img/left_manual.svg | 8 +- resources/web/homepage3/img/left_ml.svg | 8 +- resources/web/homepage3/img/left_ms.svg | 22 +-- resources/web/homepage3/img/left_online.svg | 4 +- resources/web/homepage3/img/left_ph.svg | 14 +- resources/web/homepage3/img/left_pull_btn.svg | 3 + resources/web/homepage3/js/left.js | 78 ++++++--- resources/web/homepage3/left.html | 94 ++++++---- 140 files changed, 964 insertions(+), 386 deletions(-) create mode 100644 resources/images/add_copies.svg create mode 100644 resources/images/ams_drying.svg create mode 100644 resources/images/ams_is_drying.svg create mode 100644 resources/info/nozzle_incompatibles.json delete mode 100644 resources/web/homepage3/img/i2.png create mode 100644 resources/web/homepage3/img/i2.svg create mode 100644 resources/web/homepage3/img/left_home_account.svg create mode 100644 resources/web/homepage3/img/left_library.svg create mode 100644 resources/web/homepage3/img/left_link.svg create mode 100644 resources/web/homepage3/img/left_logout_icon.svg create mode 100644 resources/web/homepage3/img/left_pull_btn.svg diff --git a/resources/cert/printer.cer b/resources/cert/printer.cer index 2f4a416..333975a 100644 --- a/resources/cert/printer.cer +++ b/resources/cert/printer.cer @@ -1,4 +1,92 @@ -----BEGIN CERTIFICATE----- +MIIFfzCCA2egAwIBAgIUXtzR6tRiL/RHBRXOoyFU0+XrliowDQYJKoZIhvcNAQEL +BQAwRjELMAkGA1UEBhMCQ04xITAfBgNVBAoMGEJCTCBUZWNobm9sb2dpZXMgQ28u +IEx0ZDEUMBIGA1UEAwwLQkJMIENBMiBSU0EwIBcNMjUwNjE3MDEzODA4WhgPMjA1 +MDA2MTcwMTM4MDhaMEYxCzAJBgNVBAYTAkNOMSEwHwYDVQQKDBhCQkwgVGVjaG5v +bG9naWVzIENvLiBMdGQxFDASBgNVBAMMC0JCTCBDQTIgUlNBMIICIjANBgkqhkiG +9w0BAQEFAAOCAg8AMIICCgKCAgEAo4550G4c42gTKzQqixwKT089RizIdZpyOcGA +679rPaOdWsMqVwnYPP2FpMqXKkjFbedE+SpGloi2NKCuiPNVRbq9PHOOZwTs7YLo +bOwf53FJuO6vRFpzFfX1tlc9zlFqJvZnYO9NgHpMysidocWcgrDN/SIDywgPB5CV +bYg3Vvzua9fwZx9e5KT9xd5IpTqdTrWS47jQOVKLhdQCbJFIlMrblOwLBAx+fHok +wqh6tkI6Ktuyyjw8Dysebi1ndWjKtZ2mW47r8xZ/J+z3EZqcyJMY6MRtx/zb1jBF +uHtkjrb5Kv1DMzSKlkaNJIbvC+Mk+hI97W+SjLSRuIdC7+oJUzWaSzgu9cjXCVfm +q8t4IL/35hP69PK95LgLectIrP96CYAT/aVMG19FrFW0QWEyfT+kzG4jkumfPbHq +Y2nNkEN0+tjj3h4WdzrWgQEojK/lhfcRFVkts74+aZoMpQP+vmL17CKmSzXk5o/e +K21xgxJdzMbdztfTpibiXk0abfOpN+1VR+3NYa+bROAKNyGaReEGsyW2bjcjNx51 +5Vqzj3SVxhMSp5vfF9E4A1jE99M/l9jQDM6RzkT0lMccGAd5tUSdNvDlrqtQaQiK +v/ZsXPgXLTWfOpvaLNEgwdMgZMuhjpkwvAZyoYfeF9kyydjDh7bvrX//cz/VopAU +lxUtQtMCAwEAAaNjMGEwHQYDVR0OBBYEFNVJgQad1sNTN0jxVkwbJ/XM1an1MB8G +A1UdIwQYMBaAFNVJgQad1sNTN0jxVkwbJ/XM1an1MA8GA1UdEwEB/wQFMAMBAf8w +DgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBCwUAA4ICAQBFZDKMJfp/N4gBeFHh +MiFehaUyMS6e9mzrTfMLJLJoj6Jopa9V9jIfcCEBGZuRThqFcATV+UdFHSINpUcH +upcCYnazTRC4dn1hnxnQ1ojQcHxdGp9xGw/YclAKD97d8bPShfBMT1to9zbMK7T5 +L8zgqg01YIOKjQk0Hcd0+0iUr6m8zQ5P8Rl3QXqAyeWgqmYQrrjTWwPsgdfHNXKX +vDrx7/cqry5lKU802hUplKMBxelv4W8407Ytj1lfJOwvxqxxsFU5jSwcUG3zo2vk +QtjRs8m5BKup5K1OPYkkPu7Ld89X0XpU073/dNDG11uxb1eDKrtNP6vZuZjNE2Pq +8HCoI1EtP+ItyqtUMvHi6Z2zsmlA25broVioeUKxjlIecpQ9JR/FhDu9CWNF/nDW +LSORNaMMzgsMSzI+HCiUhqN+qMIvVP6rzGTJzwqz/lc5Lf+ZPCnGA9WJTT4uPIhf +ufbZmnUJ35WuWKHxovDsqBh88zQ9sZ+ei4Hi4vVzOhUgfG3aLoSQEYqRoqaboANh +wCwzyuW2Rv54u5QSBbd6Gx1OpvsWmLPWd2/iL2kISl5wfmLGVydvSJa+rbOfuAy7 +ycVQacVDQCAnbhoVrQy7+454QsKSW3ZV6BcyRrorewCyCYgd7nyxflxHZTBEykXX +haGNe/KFNvJBMOIuIUzknRRmiQ== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIB8zCCAZmgAwIBAgIUe61jGQ4RzIC8k+sNuqbI/CaNqPIwCgYIKoZIzj0EAwIw +RjELMAkGA1UEBhMCQ04xITAfBgNVBAoMGEJCTCBUZWNobm9sb2dpZXMgQ28uIEx0 +ZDEUMBIGA1UEAwwLQkJMIENBMiBFQ0MwIBcNMjUwNjE3MDEzODM1WhgPMjA1MDA2 +MTcwMTM4MzVaMEYxCzAJBgNVBAYTAkNOMSEwHwYDVQQKDBhCQkwgVGVjaG5vbG9n +aWVzIENvLiBMdGQxFDASBgNVBAMMC0JCTCBDQTIgRUNDMFkwEwYHKoZIzj0CAQYI +KoZIzj0DAQcDQgAEpKTF7wRSty4DXpGJzgCPwRh8ghLlxUC3qJbyEgLqTvJgbiwY +APPHK7kVbVmerkqhHOT4QeWRlTG3dOQGLA2VpaNjMGEwHQYDVR0OBBYEFKuRpsjY +REOyIKH7HwOE6jhGBd6NMB8GA1UdIwQYMBaAFKuRpsjYREOyIKH7HwOE6jhGBd6N +MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMAoGCCqGSM49BAMCA0gA +MEUCIErBiUm3VdtP3rz4kb8aLpI5p+BzL7M9vElBGWWJxpHMAiEA3r5tJWVGwuxi +YCrB1c40KYFRFyahGrhOJZAj/YhRdnU= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIEeTCCA2GgAwIBAgIUOq+lNIaC2xsswkFqj5JPyVBl45cwDQYJKoZIhvcNAQEL +BQAwQjELMAkGA1UEBhMCQ04xIjAgBgNVBAoMGUJCTCBUZWNobm9sb2dpZXMgQ28u +LCBMdGQxDzANBgNVBAMMBkJCTCBDQTAeFw0yNTA2MTcwMjAxMjdaFw0zNTA2MTUw +MjAxMjdaMEYxCzAJBgNVBAYTAkNOMSEwHwYDVQQKDBhCQkwgVGVjaG5vbG9naWVz +IENvLiBMdGQxFDASBgNVBAMMC0JCTCBDQTIgUlNBMIICIjANBgkqhkiG9w0BAQEF +AAOCAg8AMIICCgKCAgEAo4550G4c42gTKzQqixwKT089RizIdZpyOcGA679rPaOd +WsMqVwnYPP2FpMqXKkjFbedE+SpGloi2NKCuiPNVRbq9PHOOZwTs7YLobOwf53FJ +uO6vRFpzFfX1tlc9zlFqJvZnYO9NgHpMysidocWcgrDN/SIDywgPB5CVbYg3Vvzu +a9fwZx9e5KT9xd5IpTqdTrWS47jQOVKLhdQCbJFIlMrblOwLBAx+fHokwqh6tkI6 +Ktuyyjw8Dysebi1ndWjKtZ2mW47r8xZ/J+z3EZqcyJMY6MRtx/zb1jBFuHtkjrb5 +Kv1DMzSKlkaNJIbvC+Mk+hI97W+SjLSRuIdC7+oJUzWaSzgu9cjXCVfmq8t4IL/3 +5hP69PK95LgLectIrP96CYAT/aVMG19FrFW0QWEyfT+kzG4jkumfPbHqY2nNkEN0 ++tjj3h4WdzrWgQEojK/lhfcRFVkts74+aZoMpQP+vmL17CKmSzXk5o/eK21xgxJd +zMbdztfTpibiXk0abfOpN+1VR+3NYa+bROAKNyGaReEGsyW2bjcjNx515Vqzj3SV +xhMSp5vfF9E4A1jE99M/l9jQDM6RzkT0lMccGAd5tUSdNvDlrqtQaQiKv/ZsXPgX +LTWfOpvaLNEgwdMgZMuhjpkwvAZyoYfeF9kyydjDh7bvrX//cz/VopAUlxUtQtMC +AwEAAaNjMGEwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0O +BBYEFNVJgQad1sNTN0jxVkwbJ/XM1an1MB8GA1UdIwQYMBaAFI80QmjcZ06PxCKe +xXxJ5avdRL4eMA0GCSqGSIb3DQEBCwUAA4IBAQAvS8tyfagaGsFf9YncA2ko/Na5 +9BVF+8TlUo+32oznwIVpS1AhSgLP6rNVekXNFKbuP5htudLQ17ZRBJI/UMVyYEDq +IN7xv7Zj+zJwF6W6haYrjb2Vk8igw1XvNULZfvVNNKIkvJUiVqEslWrC+k74crk/ +Wv8ChVf+zqvfIN6LV3esaGRL02J3AprQGb7DDhR1EefQMScDkNpGJMUmvCmfknrl +iK8qgvQN1SWO7JRf6fNKHsN1ZQvyP0pgLWxpT3V0/0/WttqX3cMGuJF+jVUzm/Nh +xYhFewG8vc3KzTjnwQApMA6CW554FOJWFyOD2jn5yJLT3Vue+aYDQRp4bKMx +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIICrjCCAZagAwIBAgIUOq+lNIaC2xsswkFqj5JPyVBl45gwDQYJKoZIhvcNAQEL +BQAwQjELMAkGA1UEBhMCQ04xIjAgBgNVBAoMGUJCTCBUZWNobm9sb2dpZXMgQ28u +LCBMdGQxDzANBgNVBAMMBkJCTCBDQTAeFw0yNTA2MTcwMjAxNDdaFw0zNTA2MTUw +MjAxNDdaMEYxCzAJBgNVBAYTAkNOMSEwHwYDVQQKDBhCQkwgVGVjaG5vbG9naWVz +IENvLiBMdGQxFDASBgNVBAMMC0JCTCBDQTIgRUNDMFkwEwYHKoZIzj0CAQYIKoZI +zj0DAQcDQgAEpKTF7wRSty4DXpGJzgCPwRh8ghLlxUC3qJbyEgLqTvJgbiwYAPPH +K7kVbVmerkqhHOT4QeWRlTG3dOQGLA2VpaNjMGEwDwYDVR0TAQH/BAUwAwEB/zAO +BgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFKuRpsjYREOyIKH7HwOE6jhGBd6NMB8G +A1UdIwQYMBaAFI80QmjcZ06PxCKexXxJ5avdRL4eMA0GCSqGSIb3DQEBCwUAA4IB +AQCg6PjUSSZV+4bvejcVMvgXmKzfD95osWn0ctnoMBxPDa+m+Gg+BcLT2IlFAe3E +KYMvu4T295WQc92rjKYqW6cirFppng9uEFW2mZLimxaSmutsTftE3sbMVMJ/SLYN +PV7TFv6mcBSIFWXwmBOIpbh4BUcVfONTvdSfIqfyAVxsq4xzc2nc6hPBpAm21Ayj +ToC1ev/TbDJ8VllFZiEVmWWlIP3aNzAm8S2mOpxPB2WnanaZHSrvXLFhstyzwrjD +yO1/isOZ7wtr7rcuTJdEvvvCimOZlkfRhaDoTew9tQ0E2FVpzzSinw02qmQ1xIE9 +5/H5ZzJSPkpeAHWEPnKkxg0v +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- MIIDZTCCAk2gAwIBAgIUV1FckwXElyek1onFnQ9kL7Bk4N8wDQYJKoZIhvcNAQEL BQAwQjELMAkGA1UEBhMCQ04xIjAgBgNVBAoMGUJCTCBUZWNobm9sb2dpZXMgQ28u LCBMdGQxDzANBgNVBAMMBkJCTCBDQTAeFw0yMjA0MDQwMzQyMTFaFw0zMjA0MDEw @@ -18,4 +106,4 @@ BdOoo96iX89rRPoxeed1cpq5hZwbeka3+CJGV76itWp35Up5rmmUqrlyQOr/Wax6 itosIzG0MfhgUzU51A2P/hSnD3NDMXv+wUY/AvqgIL7u7fbDKnku1GzEKIkfH8hm Rs6d8SCU89xyrwzQ0PR853irHas3WrHVqab3P+qNwR0YirL0Qk7Xt/q3O1griNg2 Blbjg3obpHo9 ------END CERTIFICATE----- +-----END CERTIFICATE----- \ No newline at end of file diff --git a/resources/images/add_copies.svg b/resources/images/add_copies.svg new file mode 100644 index 0000000..a1af9f8 --- /dev/null +++ b/resources/images/add_copies.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/images/ams_drying.svg b/resources/images/ams_drying.svg new file mode 100644 index 0000000..6713851 --- /dev/null +++ b/resources/images/ams_drying.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/images/ams_is_drying.svg b/resources/images/ams_is_drying.svg new file mode 100644 index 0000000..7c293f9 --- /dev/null +++ b/resources/images/ams_is_drying.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/images/toolbar_measure.svg b/resources/images/toolbar_measure.svg index 2ec7046..8b1580e 100644 --- a/resources/images/toolbar_measure.svg +++ b/resources/images/toolbar_measure.svg @@ -1,93 +1,11 @@ - - - - - - - - - - - - - - - + + + + + + + + + + diff --git a/resources/images/toolbar_measure_dark.svg b/resources/images/toolbar_measure_dark.svg index 0b0e032..89693e0 100644 --- a/resources/images/toolbar_measure_dark.svg +++ b/resources/images/toolbar_measure_dark.svg @@ -1,93 +1,11 @@ - - - - - - - - - - - - - - - + + + + + + + + + + diff --git a/resources/info/nozzle_incompatibles.json b/resources/info/nozzle_incompatibles.json new file mode 100644 index 0000000..016d76a --- /dev/null +++ b/resources/info/nozzle_incompatibles.json @@ -0,0 +1,34 @@ +{ + "incompatible_nozzles":{ + "Standard":{ + "0.2":[ + "QIDI PLA Marble", + "QIDI PLA Sparkle", + "QIDI PLA Wood", + "QIDI PLA Galaxy", + "QIDI PETG Translucent" + ], + "0.4":[], + "0.6":[ + "QIDI PLA Silk+", + "QIDI PLA Silk", + "QIDI PLA Aero", + "QIDI ASA-Aero" + ], + "0.8":[ + "QIDI PLA Silk+", + "QIDI PLA Silk", + "QIDI PLA Aero", + "QIDI ASA-Aero" + ] + }, + "High Flow":{ + "0.4":[ + "QIDI PLA-CF", + "QIDI PETG-CF" + ], + "0.6":[], + "0.8":[] + } + } +} \ No newline at end of file diff --git a/resources/profiles/Q Series/process/0.06mm High Quality @Q1 Pro 0.2 nozzle.json b/resources/profiles/Q Series/process/0.06mm High Quality @Q1 Pro 0.2 nozzle.json index 93b1cce..b87ae72 100644 --- a/resources/profiles/Q Series/process/0.06mm High Quality @Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Q Series/process/0.06mm High Quality @Q1 Pro 0.2 nozzle.json @@ -21,6 +21,8 @@ "outer_wall_acceleration": ["2000"], "outer_wall_line_width": "0.22", "outer_wall_speed": ["60"], + "skin_infill_line_width": "0.22", + "skeleton_infill_line_width": "0.22", "sparse_infill_line_width": "0.22", "sparse_infill_pattern": "gyroid", "sparse_infill_speed": ["100"], diff --git a/resources/profiles/Q Series/process/0.06mm Standard @Q1 Pro 0.2 nozzle.json b/resources/profiles/Q Series/process/0.06mm Standard @Q1 Pro 0.2 nozzle.json index 4f902d5..1f0f49d 100644 --- a/resources/profiles/Q Series/process/0.06mm Standard @Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Q Series/process/0.06mm Standard @Q1 Pro 0.2 nozzle.json @@ -18,6 +18,8 @@ "layer_height": "0.06", "line_width": "0.22", "outer_wall_line_width": "0.22", + "skin_infill_line_width": "0.22", + "skeleton_infill_line_width": "0.22", "sparse_infill_line_width": "0.22", "sparse_infill_speed": ["100"], "support_bottom_z_distance": "0.06", diff --git a/resources/profiles/Q Series/process/0.08mm Extra Fine @Q1 Pro.json b/resources/profiles/Q Series/process/0.08mm Extra Fine @Q1 Pro.json index b801701..087569e 100644 --- a/resources/profiles/Q Series/process/0.08mm Extra Fine @Q1 Pro.json +++ b/resources/profiles/Q Series/process/0.08mm Extra Fine @Q1 Pro.json @@ -18,6 +18,8 @@ "overhang_1_4_speed": ["60"], "overhang_2_4_speed": ["30"], "overhang_3_4_speed": ["10"], + "skin_infill_line_width": "0.22", + "skeleton_infill_line_width": "0.22", "sparse_infill_speed": ["450"], "support_bottom_z_distance": "0.08", "support_threshold_angle": "15", diff --git a/resources/profiles/Q Series/process/0.08mm High Quality @Q1 Pro 0.2 nozzle.json b/resources/profiles/Q Series/process/0.08mm High Quality @Q1 Pro 0.2 nozzle.json index 58a3d8d..cb8acd1 100644 --- a/resources/profiles/Q Series/process/0.08mm High Quality @Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Q Series/process/0.08mm High Quality @Q1 Pro 0.2 nozzle.json @@ -21,6 +21,8 @@ "outer_wall_acceleration": ["2000"], "outer_wall_line_width": "0.22", "outer_wall_speed": ["60"], + "skin_infill_line_width": "0.22", + "skeleton_infill_line_width": "0.22", "sparse_infill_line_width": "0.22", "sparse_infill_pattern": "gyroid", "sparse_infill_speed": ["100"], diff --git a/resources/profiles/Q Series/process/0.08mm High Quality @Q1 Pro.json b/resources/profiles/Q Series/process/0.08mm High Quality @Q1 Pro.json index 2ed3f49..ded17bd 100644 --- a/resources/profiles/Q Series/process/0.08mm High Quality @Q1 Pro.json +++ b/resources/profiles/Q Series/process/0.08mm High Quality @Q1 Pro.json @@ -19,6 +19,8 @@ "overhang_1_4_speed": ["60"], "overhang_2_4_speed": ["30"], "overhang_3_4_speed": ["10"], + "skin_infill_line_width": "0.22", + "skeleton_infill_line_width": "0.22", "sparse_infill_pattern": "gyroid", "sparse_infill_speed": ["150"], "support_bottom_z_distance": "0.08", diff --git a/resources/profiles/Q Series/process/0.08mm Standard @Q1 Pro 0.2 nozzle.json b/resources/profiles/Q Series/process/0.08mm Standard @Q1 Pro 0.2 nozzle.json index 30dee24..c7fa42f 100644 --- a/resources/profiles/Q Series/process/0.08mm Standard @Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Q Series/process/0.08mm Standard @Q1 Pro 0.2 nozzle.json @@ -18,6 +18,8 @@ "layer_height": "0.08", "line_width": "0.22", "outer_wall_line_width": "0.22", + "skin_infill_line_width": "0.22", + "skeleton_infill_line_width": "0.22", "sparse_infill_line_width": "0.22", "sparse_infill_speed": ["100"], "support_bottom_z_distance": "0.08", diff --git a/resources/profiles/Q Series/process/0.10mm High Quality @Q1 Pro 0.2 nozzle.json b/resources/profiles/Q Series/process/0.10mm High Quality @Q1 Pro 0.2 nozzle.json index 09c5aa0..3650954 100644 --- a/resources/profiles/Q Series/process/0.10mm High Quality @Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Q Series/process/0.10mm High Quality @Q1 Pro 0.2 nozzle.json @@ -21,6 +21,8 @@ "outer_wall_acceleration": ["2000"], "outer_wall_line_width": "0.22", "outer_wall_speed": ["60"], + "skin_infill_line_width": "0.22", + "skeleton_infill_line_width": "0.22", "sparse_infill_line_width": "0.22", "sparse_infill_pattern": "gyroid", "sparse_infill_speed": ["100"], diff --git a/resources/profiles/Q Series/process/0.10mm Standard @Q1 Pro 0.2 nozzle.json b/resources/profiles/Q Series/process/0.10mm Standard @Q1 Pro 0.2 nozzle.json index 06df36b..17e56b9 100644 --- a/resources/profiles/Q Series/process/0.10mm Standard @Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Q Series/process/0.10mm Standard @Q1 Pro 0.2 nozzle.json @@ -18,6 +18,8 @@ "layer_height": "0.1", "line_width": "0.22", "outer_wall_line_width": "0.22", + "skin_infill_line_width": "0.22", + "skeleton_infill_line_width": "0.22", "sparse_infill_line_width": "0.22", "sparse_infill_speed": ["100"], "support_bottom_z_distance": "0.1", diff --git a/resources/profiles/Q Series/process/0.12mm Fine @Q1 Pro.json b/resources/profiles/Q Series/process/0.12mm Fine @Q1 Pro.json index 8e28411..881785f 100644 --- a/resources/profiles/Q Series/process/0.12mm Fine @Q1 Pro.json +++ b/resources/profiles/Q Series/process/0.12mm Fine @Q1 Pro.json @@ -17,6 +17,8 @@ "overhang_1_4_speed": ["60"], "overhang_2_4_speed": ["30"], "overhang_3_4_speed": ["10"], + "skin_infill_line_width": "0.22", + "skeleton_infill_line_width": "0.22", "sparse_infill_speed": ["430"], "support_bottom_z_distance": "0.12", "support_threshold_angle": "20", diff --git a/resources/profiles/Q Series/process/0.12mm High Quality @Q1 Pro.json b/resources/profiles/Q Series/process/0.12mm High Quality @Q1 Pro.json index 55cf32b..cd71de6 100644 --- a/resources/profiles/Q Series/process/0.12mm High Quality @Q1 Pro.json +++ b/resources/profiles/Q Series/process/0.12mm High Quality @Q1 Pro.json @@ -18,6 +18,8 @@ "overhang_1_4_speed": ["60"], "overhang_2_4_speed": ["30"], "overhang_3_4_speed": ["10"], + "skin_infill_line_width": "0.22", + "skeleton_infill_line_width": "0.22", "sparse_infill_pattern": "gyroid", "sparse_infill_speed": ["180"], "support_bottom_z_distance": "0.12", diff --git a/resources/profiles/Q Series/process/0.12mm Standard @Q1 Pro 0.2 nozzle.json b/resources/profiles/Q Series/process/0.12mm Standard @Q1 Pro 0.2 nozzle.json index aca7ff0..8a7f15d 100644 --- a/resources/profiles/Q Series/process/0.12mm Standard @Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Q Series/process/0.12mm Standard @Q1 Pro 0.2 nozzle.json @@ -18,6 +18,8 @@ "layer_height": "0.12", "line_width": "0.22", "outer_wall_line_width": "0.22", + "skin_infill_line_width": "0.22", + "skeleton_infill_line_width": "0.22", "sparse_infill_line_width": "0.22", "sparse_infill_speed": ["100"], "support_bottom_z_distance": "0.12", diff --git a/resources/profiles/Q Series/process/0.14mm Standard @Q1 Pro 0.2 nozzle.json b/resources/profiles/Q Series/process/0.14mm Standard @Q1 Pro 0.2 nozzle.json index b92d062..cb2ccd0 100644 --- a/resources/profiles/Q Series/process/0.14mm Standard @Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Q Series/process/0.14mm Standard @Q1 Pro 0.2 nozzle.json @@ -18,6 +18,8 @@ "layer_height": "0.14", "line_width": "0.22", "outer_wall_line_width": "0.22", + "skin_infill_line_width": "0.22", + "skeleton_infill_line_width": "0.22", "sparse_infill_line_width": "0.22", "sparse_infill_speed": ["100"], "support_bottom_z_distance": "0.14", diff --git a/resources/profiles/Q Series/process/0.16mm High Quality @Q1 Pro.json b/resources/profiles/Q Series/process/0.16mm High Quality @Q1 Pro.json index 200014d..5b738d0 100644 --- a/resources/profiles/Q Series/process/0.16mm High Quality @Q1 Pro.json +++ b/resources/profiles/Q Series/process/0.16mm High Quality @Q1 Pro.json @@ -18,6 +18,8 @@ "overhang_1_4_speed": ["60"], "overhang_2_4_speed": ["30"], "overhang_3_4_speed": ["10"], + "skin_infill_line_width": "0.22", + "skeleton_infill_line_width": "0.22", "sparse_infill_pattern": "gyroid", "sparse_infill_speed": ["200"], "support_bottom_z_distance": "0.16", diff --git a/resources/profiles/Q Series/process/0.16mm Optimal @Q1 Pro.json b/resources/profiles/Q Series/process/0.16mm Optimal @Q1 Pro.json index 5419a4e..95fd21f 100644 --- a/resources/profiles/Q Series/process/0.16mm Optimal @Q1 Pro.json +++ b/resources/profiles/Q Series/process/0.16mm Optimal @Q1 Pro.json @@ -17,6 +17,8 @@ "overhang_1_4_speed": ["60"], "overhang_2_4_speed": ["30"], "overhang_3_4_speed": ["10"], + "skin_infill_line_width": "0.22", + "skeleton_infill_line_width": "0.22", "sparse_infill_speed": ["330"], "support_bottom_z_distance": "0.16", "support_threshold_angle": "25", diff --git a/resources/profiles/Q Series/process/0.18mm Standard @Q1 Pro 0.6 nozzle.json b/resources/profiles/Q Series/process/0.18mm Standard @Q1 Pro 0.6 nozzle.json index d733159..47f1733 100644 --- a/resources/profiles/Q Series/process/0.18mm Standard @Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Q Series/process/0.18mm Standard @Q1 Pro 0.6 nozzle.json @@ -18,6 +18,8 @@ "line_width": "0.62", "outer_wall_line_width": "0.62", "overhang_3_4_speed": ["15"], + "skin_infill_line_width": "0.62", + "skeleton_infill_line_width": "0.62", "sparse_infill_line_width": "0.62", "sparse_infill_speed": ["100"], "support_bottom_z_distance": "0.18", diff --git a/resources/profiles/Q Series/process/0.24mm Draft @Q1 Pro.json b/resources/profiles/Q Series/process/0.24mm Draft @Q1 Pro.json index a651ce9..65b828a 100644 --- a/resources/profiles/Q Series/process/0.24mm Draft @Q1 Pro.json +++ b/resources/profiles/Q Series/process/0.24mm Draft @Q1 Pro.json @@ -12,6 +12,8 @@ "internal_solid_infill_speed": ["230"], "layer_height": "0.24", "outer_wall_speed": ["200"], + "skin_infill_line_width": "0.62", + "skeleton_infill_line_width": "0.62", "sparse_infill_speed": ["230"], "support_threshold_angle": "35", "top_color_penetration_layers": "4", diff --git a/resources/profiles/Q Series/process/0.24mm Standard @Q1 Pro 0.6 nozzle.json b/resources/profiles/Q Series/process/0.24mm Standard @Q1 Pro 0.6 nozzle.json index 79098f9..877ce3b 100644 --- a/resources/profiles/Q Series/process/0.24mm Standard @Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Q Series/process/0.24mm Standard @Q1 Pro 0.6 nozzle.json @@ -18,6 +18,8 @@ "line_width": "0.62", "outer_wall_line_width": "0.62", "overhang_3_4_speed": ["15"], + "skin_infill_line_width": "0.62", + "skeleton_infill_line_width": "0.62", "sparse_infill_line_width": "0.62", "sparse_infill_speed": ["100"], "support_line_width": "0.62", diff --git a/resources/profiles/Q Series/process/0.24mm Standard @Q1 Pro 0.8 nozzle.json b/resources/profiles/Q Series/process/0.24mm Standard @Q1 Pro 0.8 nozzle.json index 095a9fa..717ff37 100644 --- a/resources/profiles/Q Series/process/0.24mm Standard @Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Q Series/process/0.24mm Standard @Q1 Pro 0.8 nozzle.json @@ -19,6 +19,8 @@ "outer_wall_line_width": "0.82", "overhang_3_4_speed": ["25"], "overhang_4_4_speed": ["5"], + "skin_infill_line_width": "0.82", + "skeleton_infill_line_width": "0.82", "sparse_infill_line_width": "0.82", "sparse_infill_speed": ["100"], "support_line_width": "0.82", diff --git a/resources/profiles/Q Series/process/0.30mm Standard @Q1 Pro 0.6 nozzle.json b/resources/profiles/Q Series/process/0.30mm Standard @Q1 Pro 0.6 nozzle.json index 9647386..84fd750 100644 --- a/resources/profiles/Q Series/process/0.30mm Standard @Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Q Series/process/0.30mm Standard @Q1 Pro 0.6 nozzle.json @@ -18,6 +18,8 @@ "line_width": "0.62", "outer_wall_line_width": "0.62", "overhang_3_4_speed": ["15"], + "skin_infill_line_width": "0.62", + "skeleton_infill_line_width": "0.62", "sparse_infill_line_width": "0.62", "sparse_infill_speed": ["100"], "support_line_width": "0.62", diff --git a/resources/profiles/Q Series/process/0.30mm Strength @Q1 Pro 0.6 nozzle.json b/resources/profiles/Q Series/process/0.30mm Strength @Q1 Pro 0.6 nozzle.json index 491059f..bed4f27 100644 --- a/resources/profiles/Q Series/process/0.30mm Strength @Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Q Series/process/0.30mm Strength @Q1 Pro 0.6 nozzle.json @@ -18,6 +18,8 @@ "line_width": "0.62", "outer_wall_line_width": "0.62", "overhang_3_4_speed": ["15"], + "skin_infill_line_width": "0.62", + "skeleton_infill_line_width": "0.62", "sparse_infill_density": "25%", "sparse_infill_line_width": "0.62", "sparse_infill_speed": ["100"], diff --git a/resources/profiles/Q Series/process/0.32mm Standard @Q1 Pro 0.8 nozzle.json b/resources/profiles/Q Series/process/0.32mm Standard @Q1 Pro 0.8 nozzle.json index 44ad38a..d0638b2 100644 --- a/resources/profiles/Q Series/process/0.32mm Standard @Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Q Series/process/0.32mm Standard @Q1 Pro 0.8 nozzle.json @@ -19,6 +19,8 @@ "outer_wall_line_width": "0.82", "overhang_3_4_speed": ["25"], "overhang_4_4_speed": ["5"], + "skin_infill_line_width": "0.82", + "skeleton_infill_line_width": "0.82", "sparse_infill_line_width": "0.82", "sparse_infill_speed": ["100"], "support_line_width": "0.82", diff --git a/resources/profiles/Q Series/process/0.36mm Standard @Q1 Pro 0.6 nozzle.json b/resources/profiles/Q Series/process/0.36mm Standard @Q1 Pro 0.6 nozzle.json index 2afc627..0535a13 100644 --- a/resources/profiles/Q Series/process/0.36mm Standard @Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Q Series/process/0.36mm Standard @Q1 Pro 0.6 nozzle.json @@ -18,6 +18,8 @@ "line_width": "0.62", "outer_wall_line_width": "0.62", "overhang_3_4_speed": ["15"], + "skin_infill_line_width": "0.62", + "skeleton_infill_line_width": "0.62", "sparse_infill_line_width": "0.62", "sparse_infill_speed": ["100"], "support_line_width": "0.62", diff --git a/resources/profiles/Q Series/process/0.40mm Standard @Q1 Pro 0.8 nozzle.json b/resources/profiles/Q Series/process/0.40mm Standard @Q1 Pro 0.8 nozzle.json index 46ec4fc..c3fd8bd 100644 --- a/resources/profiles/Q Series/process/0.40mm Standard @Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Q Series/process/0.40mm Standard @Q1 Pro 0.8 nozzle.json @@ -19,6 +19,8 @@ "outer_wall_line_width": "0.82", "overhang_3_4_speed": ["25"], "overhang_4_4_speed": ["5"], + "skin_infill_line_width": "0.82", + "skeleton_infill_line_width": "0.82", "sparse_infill_line_width": "0.82", "sparse_infill_speed": ["100"], "support_line_width": "0.82", diff --git a/resources/profiles/Q Series/process/0.42mm Standard @Q1 Pro 0.6 nozzle.json b/resources/profiles/Q Series/process/0.42mm Standard @Q1 Pro 0.6 nozzle.json index e9415a4..8926679 100644 --- a/resources/profiles/Q Series/process/0.42mm Standard @Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Q Series/process/0.42mm Standard @Q1 Pro 0.6 nozzle.json @@ -18,6 +18,8 @@ "line_width": "0.62", "outer_wall_line_width": "0.62", "overhang_3_4_speed": ["15"], + "skin_infill_line_width": "0.62", + "skeleton_infill_line_width": "0.62", "sparse_infill_line_width": "0.62", "sparse_infill_speed": ["100"], "support_line_width": "0.62", diff --git a/resources/profiles/Q Series/process/0.48mm Standard @Q1 Pro 0.8 nozzle.json b/resources/profiles/Q Series/process/0.48mm Standard @Q1 Pro 0.8 nozzle.json index 359c029..a7422c3 100644 --- a/resources/profiles/Q Series/process/0.48mm Standard @Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Q Series/process/0.48mm Standard @Q1 Pro 0.8 nozzle.json @@ -19,6 +19,8 @@ "outer_wall_line_width": "0.82", "overhang_3_4_speed": ["25"], "overhang_4_4_speed": ["5"], + "skin_infill_line_width": "0.82", + "skeleton_infill_line_width": "0.82", "sparse_infill_line_width": "0.82", "sparse_infill_speed": ["100"], "support_line_width": "0.82", diff --git a/resources/profiles/Q Series/process/0.56mm Standard @Q1 Pro 0.8 nozzle.json b/resources/profiles/Q Series/process/0.56mm Standard @Q1 Pro 0.8 nozzle.json index 1277503..fcb2934 100644 --- a/resources/profiles/Q Series/process/0.56mm Standard @Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Q Series/process/0.56mm Standard @Q1 Pro 0.8 nozzle.json @@ -19,6 +19,8 @@ "outer_wall_line_width": "0.82", "overhang_3_4_speed": ["25"], "overhang_4_4_speed": ["5"], + "skin_infill_line_width": "0.82", + "skeleton_infill_line_width": "0.82", "sparse_infill_line_width": "0.82", "sparse_infill_speed": ["100"], "support_line_width": "0.82", diff --git a/resources/profiles/Q Series/process/fdm_process_common.json b/resources/profiles/Q Series/process/fdm_process_common.json index 9867436..933715f 100644 --- a/resources/profiles/Q Series/process/fdm_process_common.json +++ b/resources/profiles/Q Series/process/fdm_process_common.json @@ -4,6 +4,7 @@ "from": "system", "instantiation": "false", "adaptive_layer_height": "0", + "apply_top_surface_compensation": "0", "bottom_color_penetration_layers": "3", "bottom_shell_layers": "3", "bottom_shell_thickness": "0", @@ -21,6 +22,7 @@ "draft_shield": "disabled", "elefant_foot_compensation": "0", "enable_arc_fitting": "0", + "enable_height_slowdown": ["0"], "enable_overhang_speed": ["1"], "enable_prime_tower": "1", "enable_support": "0", @@ -28,6 +30,8 @@ "gap_infill_speed": ["50"], "infill_combination": "0", "infill_direction": "45", + "infill_lock_depth": "1.0", + "infill_rotate_step": "0", "infill_wall_overlap": "15%", "initial_layer_acceleration": ["500"], "initial_layer_infill_speed": ["105"], @@ -48,8 +52,14 @@ "ironing_type": "no ironing", "layer_height": "0.2", "line_width": "0.42", + "locked_skin_infill_pattern": "crosszag", + "locked_skeleton_infill_pattern": "zigzag", "max_travel_detour_distance": "0", + "machine_prepare_compensation_time": "260", "minimum_sparse_infill_area": "15", + "nozzle_flush_dataset": [ + "0" + ], "only_one_wall_top": "1", "outer_wall_acceleration": ["3000"], "outer_wall_line_width": "0.42", @@ -59,6 +69,7 @@ "overhang_3_4_speed": ["30"], "overhang_4_4_speed": ["10"], "overhang_totally_speed": ["10"], + "override_filament_scarf_seam_setting": "0", "prime_tower_width": "35", "print_sequence": "by layer", "print_settings_id": "", @@ -67,9 +78,32 @@ "reduce_infill_retraction": "1", "resolution": "0.012", "seam_position": "aligned", + "seam_placement_away_from_overhangs": "0", + "skeleton_infill_density": "15%", + "skin_infill_density": "15%", + "skin_infill_depth": "2.0", + "skin_infill_line_width": "0.45", "skirt_distance": "2", "skirt_height": "1", "skirt_loops": "0", + "slowdown_start_height": [ + "0" + ], + "slowdown_start_speed": [ + "1000" + ], + "slowdown_start_acc": [ + "100000" + ], + "slowdown_end_height": [ + "400" + ], + "slowdown_end_speed": [ + "1000" + ], + "slowdown_end_acc": [ + "100000" + ], "small_perimeter_speed": ["50%"], "small_perimeter_threshold": ["4"], "smooth_coefficient": "90", @@ -100,6 +134,11 @@ "support_threshold_angle": "30", "support_top_z_distance": "0.2", "support_type": "tree(auto)", + "seam_slope_type": "none", + "seam_slope_start_height": "10%", + "seam_slope_gap": "0", + "seam_slope_min_length": "10", + "symmetric_infill_y_axis": "0", "top_color_penetration_layers": "3", "top_shell_layers": "3", "top_shell_thickness": "0.8", @@ -119,5 +158,14 @@ "wipe_tower_no_sparse_layers": "0", "xy_contour_compensation": "0", "xy_hole_compensation": "0", + "z_direction_outwall_speed_continuous": "0", + "enable_circle_compensation": "0", + "circle_compensation_manual_offset": "0", + "infill_shift_step": "0.4", + "prime_tower_enable_framework": "0", + "prime_tower_lift_speed": "90", + "prime_tower_lift_height": "-1", + "prime_tower_max_speed": "90", + "prime_tower_flat_ironing":"0", "compatible_printers": [] } diff --git a/resources/profiles/X 3 Series/process/0.06mm High Quality @XMax3 0.2 nozzle.json b/resources/profiles/X 3 Series/process/0.06mm High Quality @XMax3 0.2 nozzle.json index 660f1d2..a7d40e7 100644 --- a/resources/profiles/X 3 Series/process/0.06mm High Quality @XMax3 0.2 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.06mm High Quality @XMax3 0.2 nozzle.json @@ -21,6 +21,8 @@ "outer_wall_acceleration": ["2000"], "outer_wall_line_width": "0.22", "outer_wall_speed": ["60"], + "skin_infill_line_width": "0.22", + "skeleton_infill_line_width": "0.22", "sparse_infill_line_width": "0.22", "sparse_infill_pattern": "gyroid", "sparse_infill_speed": ["100"], diff --git a/resources/profiles/X 3 Series/process/0.06mm High Quality @XPlus3 0.2 nozzle.json b/resources/profiles/X 3 Series/process/0.06mm High Quality @XPlus3 0.2 nozzle.json index 1337380..8cf1967 100644 --- a/resources/profiles/X 3 Series/process/0.06mm High Quality @XPlus3 0.2 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.06mm High Quality @XPlus3 0.2 nozzle.json @@ -21,6 +21,8 @@ "outer_wall_acceleration": ["2000"], "outer_wall_line_width": "0.22", "outer_wall_speed": ["60"], + "skin_infill_line_width": "0.22", + "skeleton_infill_line_width": "0.22", "sparse_infill_line_width": "0.22", "sparse_infill_pattern": "gyroid", "sparse_infill_speed": ["100"], diff --git a/resources/profiles/X 3 Series/process/0.06mm High Quality @XSmart3 0.2 nozzle.json b/resources/profiles/X 3 Series/process/0.06mm High Quality @XSmart3 0.2 nozzle.json index 9996e31..62aeed5 100644 --- a/resources/profiles/X 3 Series/process/0.06mm High Quality @XSmart3 0.2 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.06mm High Quality @XSmart3 0.2 nozzle.json @@ -21,6 +21,8 @@ "outer_wall_acceleration": ["2000"], "outer_wall_line_width": "0.22", "outer_wall_speed": ["60"], + "skin_infill_line_width": "0.22", + "skeleton_infill_line_width": "0.22", "sparse_infill_line_width": "0.22", "sparse_infill_pattern": "gyroid", "sparse_infill_speed": ["100"], diff --git a/resources/profiles/X 3 Series/process/0.06mm Standard @XMax3 0.2 nozzle.json b/resources/profiles/X 3 Series/process/0.06mm Standard @XMax3 0.2 nozzle.json index fcfe179..3ed2467 100644 --- a/resources/profiles/X 3 Series/process/0.06mm Standard @XMax3 0.2 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.06mm Standard @XMax3 0.2 nozzle.json @@ -18,6 +18,8 @@ "layer_height": "0.06", "line_width": "0.22", "outer_wall_line_width": "0.22", + "skin_infill_line_width": "0.22", + "skeleton_infill_line_width": "0.22", "sparse_infill_line_width": "0.22", "sparse_infill_speed": ["100"], "support_bottom_z_distance": "0.06", diff --git a/resources/profiles/X 3 Series/process/0.06mm Standard @XPlus3 0.2 nozzle.json b/resources/profiles/X 3 Series/process/0.06mm Standard @XPlus3 0.2 nozzle.json index 2f2d26d..4aec98f 100644 --- a/resources/profiles/X 3 Series/process/0.06mm Standard @XPlus3 0.2 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.06mm Standard @XPlus3 0.2 nozzle.json @@ -18,6 +18,8 @@ "layer_height": "0.06", "line_width": "0.22", "outer_wall_line_width": "0.22", + "skin_infill_line_width": "0.22", + "skeleton_infill_line_width": "0.22", "sparse_infill_line_width": "0.22", "sparse_infill_speed": ["100"], "support_bottom_z_distance": "0.06", diff --git a/resources/profiles/X 3 Series/process/0.06mm Standard @XSmart3 0.2 nozzle.json b/resources/profiles/X 3 Series/process/0.06mm Standard @XSmart3 0.2 nozzle.json index 406bad6..9d8397e 100644 --- a/resources/profiles/X 3 Series/process/0.06mm Standard @XSmart3 0.2 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.06mm Standard @XSmart3 0.2 nozzle.json @@ -18,6 +18,8 @@ "layer_height": "0.06", "line_width": "0.22", "outer_wall_line_width": "0.22", + "skin_infill_line_width": "0.22", + "skeleton_infill_line_width": "0.22", "sparse_infill_line_width": "0.22", "sparse_infill_speed": ["100"], "support_bottom_z_distance": "0.06", diff --git a/resources/profiles/X 3 Series/process/0.08mm High Quality @XMax3 0.2 nozzle.json b/resources/profiles/X 3 Series/process/0.08mm High Quality @XMax3 0.2 nozzle.json index 56752fa..62a695a 100644 --- a/resources/profiles/X 3 Series/process/0.08mm High Quality @XMax3 0.2 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.08mm High Quality @XMax3 0.2 nozzle.json @@ -21,6 +21,8 @@ "outer_wall_acceleration": ["2000"], "outer_wall_line_width": "0.22", "outer_wall_speed": ["60"], + "skin_infill_line_width": "0.22", + "skeleton_infill_line_width": "0.22", "sparse_infill_line_width": "0.22", "sparse_infill_pattern": "gyroid", "sparse_infill_speed": ["100"], diff --git a/resources/profiles/X 3 Series/process/0.08mm High Quality @XPlus3 0.2 nozzle.json b/resources/profiles/X 3 Series/process/0.08mm High Quality @XPlus3 0.2 nozzle.json index 1791f6b..b724c33 100644 --- a/resources/profiles/X 3 Series/process/0.08mm High Quality @XPlus3 0.2 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.08mm High Quality @XPlus3 0.2 nozzle.json @@ -21,6 +21,8 @@ "outer_wall_acceleration": ["2000"], "outer_wall_line_width": "0.22", "outer_wall_speed": ["60"], + "skin_infill_line_width": "0.22", + "skeleton_infill_line_width": "0.22", "sparse_infill_line_width": "0.22", "sparse_infill_pattern": "gyroid", "sparse_infill_speed": ["100"], diff --git a/resources/profiles/X 3 Series/process/0.08mm High Quality @XSmart3 0.2 nozzle.json b/resources/profiles/X 3 Series/process/0.08mm High Quality @XSmart3 0.2 nozzle.json index 075c7c5..91b2f95 100644 --- a/resources/profiles/X 3 Series/process/0.08mm High Quality @XSmart3 0.2 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.08mm High Quality @XSmart3 0.2 nozzle.json @@ -21,6 +21,8 @@ "outer_wall_acceleration": ["2000"], "outer_wall_line_width": "0.22", "outer_wall_speed": ["60"], + "skin_infill_line_width": "0.22", + "skeleton_infill_line_width": "0.22", "sparse_infill_line_width": "0.22", "sparse_infill_pattern": "gyroid", "sparse_infill_speed": ["100"], diff --git a/resources/profiles/X 3 Series/process/0.08mm Standard @XMax3 0.2 nozzle.json b/resources/profiles/X 3 Series/process/0.08mm Standard @XMax3 0.2 nozzle.json index 90b6957..759aaa6 100644 --- a/resources/profiles/X 3 Series/process/0.08mm Standard @XMax3 0.2 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.08mm Standard @XMax3 0.2 nozzle.json @@ -18,6 +18,8 @@ "layer_height": "0.08", "line_width": "0.22", "outer_wall_line_width": "0.22", + "skin_infill_line_width": "0.22", + "skeleton_infill_line_width": "0.22", "sparse_infill_line_width": "0.22", "sparse_infill_speed": ["100"], "support_bottom_z_distance": "0.08", diff --git a/resources/profiles/X 3 Series/process/0.08mm Standard @XPlus3 0.2 nozzle.json b/resources/profiles/X 3 Series/process/0.08mm Standard @XPlus3 0.2 nozzle.json index 414e1d1..a3db07d 100644 --- a/resources/profiles/X 3 Series/process/0.08mm Standard @XPlus3 0.2 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.08mm Standard @XPlus3 0.2 nozzle.json @@ -18,6 +18,8 @@ "layer_height": "0.08", "line_width": "0.22", "outer_wall_line_width": "0.22", + "skin_infill_line_width": "0.22", + "skeleton_infill_line_width": "0.22", "sparse_infill_line_width": "0.22", "sparse_infill_speed": ["100"], "support_bottom_z_distance": "0.08", diff --git a/resources/profiles/X 3 Series/process/0.08mm Standard @XSmart3 0.2 nozzle.json b/resources/profiles/X 3 Series/process/0.08mm Standard @XSmart3 0.2 nozzle.json index af419c7..154ded0 100644 --- a/resources/profiles/X 3 Series/process/0.08mm Standard @XSmart3 0.2 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.08mm Standard @XSmart3 0.2 nozzle.json @@ -18,6 +18,8 @@ "layer_height": "0.08", "line_width": "0.22", "outer_wall_line_width": "0.22", + "skin_infill_line_width": "0.22", + "skeleton_infill_line_width": "0.22", "sparse_infill_line_width": "0.22", "sparse_infill_speed": ["100"], "support_bottom_z_distance": "0.08", diff --git a/resources/profiles/X 3 Series/process/0.10mm High Quality @XMax3 0.2 nozzle.json b/resources/profiles/X 3 Series/process/0.10mm High Quality @XMax3 0.2 nozzle.json index 99dfc63..5cc68d6 100644 --- a/resources/profiles/X 3 Series/process/0.10mm High Quality @XMax3 0.2 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.10mm High Quality @XMax3 0.2 nozzle.json @@ -21,6 +21,8 @@ "outer_wall_acceleration": ["2000"], "outer_wall_line_width": "0.22", "outer_wall_speed": ["60"], + "skin_infill_line_width": "0.22", + "skeleton_infill_line_width": "0.22", "sparse_infill_line_width": "0.22", "sparse_infill_pattern": "gyroid", "sparse_infill_speed": ["100"], diff --git a/resources/profiles/X 3 Series/process/0.10mm High Quality @XPlus3 0.2 nozzle.json b/resources/profiles/X 3 Series/process/0.10mm High Quality @XPlus3 0.2 nozzle.json index abad901..a00fe8b 100644 --- a/resources/profiles/X 3 Series/process/0.10mm High Quality @XPlus3 0.2 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.10mm High Quality @XPlus3 0.2 nozzle.json @@ -21,6 +21,8 @@ "outer_wall_acceleration": ["2000"], "outer_wall_line_width": "0.22", "outer_wall_speed": ["60"], + "skin_infill_line_width": "0.22", + "skeleton_infill_line_width": "0.22", "sparse_infill_line_width": "0.22", "sparse_infill_pattern": "gyroid", "sparse_infill_speed": ["100"], diff --git a/resources/profiles/X 3 Series/process/0.10mm High Quality @XSmart3 0.2 nozzle.json b/resources/profiles/X 3 Series/process/0.10mm High Quality @XSmart3 0.2 nozzle.json index d734ec2..c816ea7 100644 --- a/resources/profiles/X 3 Series/process/0.10mm High Quality @XSmart3 0.2 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.10mm High Quality @XSmart3 0.2 nozzle.json @@ -21,6 +21,8 @@ "outer_wall_acceleration": ["2000"], "outer_wall_line_width": "0.22", "outer_wall_speed": ["60"], + "skin_infill_line_width": "0.22", + "skeleton_infill_line_width": "0.22", "sparse_infill_line_width": "0.22", "sparse_infill_pattern": "gyroid", "sparse_infill_speed": ["100"], diff --git a/resources/profiles/X 3 Series/process/0.10mm Standard @XMax3 0.2 nozzle.json b/resources/profiles/X 3 Series/process/0.10mm Standard @XMax3 0.2 nozzle.json index 3f7d937..aea0bcf 100644 --- a/resources/profiles/X 3 Series/process/0.10mm Standard @XMax3 0.2 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.10mm Standard @XMax3 0.2 nozzle.json @@ -18,6 +18,8 @@ "layer_height": "0.1", "line_width": "0.22", "outer_wall_line_width": "0.22", + "skin_infill_line_width": "0.22", + "skeleton_infill_line_width": "0.22", "sparse_infill_line_width": "0.22", "sparse_infill_speed": ["100"], "support_bottom_z_distance": "0.1", diff --git a/resources/profiles/X 3 Series/process/0.10mm Standard @XPlus3 0.2 nozzle.json b/resources/profiles/X 3 Series/process/0.10mm Standard @XPlus3 0.2 nozzle.json index e190329..332ccdd 100644 --- a/resources/profiles/X 3 Series/process/0.10mm Standard @XPlus3 0.2 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.10mm Standard @XPlus3 0.2 nozzle.json @@ -18,6 +18,8 @@ "layer_height": "0.1", "line_width": "0.22", "outer_wall_line_width": "0.22", + "skin_infill_line_width": "0.22", + "skeleton_infill_line_width": "0.22", "sparse_infill_line_width": "0.22", "sparse_infill_speed": ["100"], "support_bottom_z_distance": "0.1", diff --git a/resources/profiles/X 3 Series/process/0.10mm Standard @XSmart3 0.2 nozzle.json b/resources/profiles/X 3 Series/process/0.10mm Standard @XSmart3 0.2 nozzle.json index 74b59fe..c38543f 100644 --- a/resources/profiles/X 3 Series/process/0.10mm Standard @XSmart3 0.2 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.10mm Standard @XSmart3 0.2 nozzle.json @@ -18,6 +18,8 @@ "layer_height": "0.1", "line_width": "0.22", "outer_wall_line_width": "0.22", + "skin_infill_line_width": "0.22", + "skeleton_infill_line_width": "0.22", "sparse_infill_line_width": "0.22", "sparse_infill_speed": ["100"], "support_bottom_z_distance": "0.1", diff --git a/resources/profiles/X 3 Series/process/0.12mm Standard @XMax3 0.2 nozzle.json b/resources/profiles/X 3 Series/process/0.12mm Standard @XMax3 0.2 nozzle.json index f0d3287..b3b2779 100644 --- a/resources/profiles/X 3 Series/process/0.12mm Standard @XMax3 0.2 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.12mm Standard @XMax3 0.2 nozzle.json @@ -18,6 +18,8 @@ "layer_height": "0.12", "line_width": "0.22", "outer_wall_line_width": "0.22", + "skin_infill_line_width": "0.22", + "skeleton_infill_line_width": "0.22", "sparse_infill_line_width": "0.22", "sparse_infill_speed": ["100"], "support_bottom_z_distance": "0.12", diff --git a/resources/profiles/X 3 Series/process/0.12mm Standard @XPlus3 0.2 nozzle.json b/resources/profiles/X 3 Series/process/0.12mm Standard @XPlus3 0.2 nozzle.json index 661e249..08f439b 100644 --- a/resources/profiles/X 3 Series/process/0.12mm Standard @XPlus3 0.2 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.12mm Standard @XPlus3 0.2 nozzle.json @@ -18,6 +18,8 @@ "layer_height": "0.12", "line_width": "0.22", "outer_wall_line_width": "0.22", + "skin_infill_line_width": "0.22", + "skeleton_infill_line_width": "0.22", "sparse_infill_line_width": "0.22", "sparse_infill_speed": ["100"], "support_bottom_z_distance": "0.12", diff --git a/resources/profiles/X 3 Series/process/0.12mm Standard @XSmart3 0.2 nozzle.json b/resources/profiles/X 3 Series/process/0.12mm Standard @XSmart3 0.2 nozzle.json index 3f8c467..aa04ec0 100644 --- a/resources/profiles/X 3 Series/process/0.12mm Standard @XSmart3 0.2 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.12mm Standard @XSmart3 0.2 nozzle.json @@ -18,6 +18,8 @@ "layer_height": "0.12", "line_width": "0.22", "outer_wall_line_width": "0.22", + "skin_infill_line_width": "0.22", + "skeleton_infill_line_width": "0.22", "sparse_infill_line_width": "0.22", "sparse_infill_speed": ["100"], "support_bottom_z_distance": "0.12", diff --git a/resources/profiles/X 3 Series/process/0.14mm Standard @XMax3 0.2 nozzle.json b/resources/profiles/X 3 Series/process/0.14mm Standard @XMax3 0.2 nozzle.json index 879457e..b15aba6 100644 --- a/resources/profiles/X 3 Series/process/0.14mm Standard @XMax3 0.2 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.14mm Standard @XMax3 0.2 nozzle.json @@ -18,6 +18,8 @@ "layer_height": "0.14", "line_width": "0.22", "outer_wall_line_width": "0.22", + "skin_infill_line_width": "0.22", + "skeleton_infill_line_width": "0.22", "sparse_infill_line_width": "0.22", "sparse_infill_speed": ["100"], "support_bottom_z_distance": "0.14", diff --git a/resources/profiles/X 3 Series/process/0.14mm Standard @XPlus3 0.2 nozzle.json b/resources/profiles/X 3 Series/process/0.14mm Standard @XPlus3 0.2 nozzle.json index 32fb32d..33c85de 100644 --- a/resources/profiles/X 3 Series/process/0.14mm Standard @XPlus3 0.2 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.14mm Standard @XPlus3 0.2 nozzle.json @@ -18,6 +18,8 @@ "layer_height": "0.14", "line_width": "0.22", "outer_wall_line_width": "0.22", + "skin_infill_line_width": "0.22", + "skeleton_infill_line_width": "0.22", "sparse_infill_line_width": "0.22", "sparse_infill_speed": ["100"], "support_bottom_z_distance": "0.14", diff --git a/resources/profiles/X 3 Series/process/0.14mm Standard @XSmart3 0.2 nozzle.json b/resources/profiles/X 3 Series/process/0.14mm Standard @XSmart3 0.2 nozzle.json index 2306018..32183d4 100644 --- a/resources/profiles/X 3 Series/process/0.14mm Standard @XSmart3 0.2 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.14mm Standard @XSmart3 0.2 nozzle.json @@ -18,6 +18,8 @@ "layer_height": "0.14", "line_width": "0.22", "outer_wall_line_width": "0.22", + "skin_infill_line_width": "0.22", + "skeleton_infill_line_width": "0.22", "sparse_infill_line_width": "0.22", "sparse_infill_speed": ["100"], "support_bottom_z_distance": "0.14", diff --git a/resources/profiles/X 3 Series/process/0.18mm Standard @XMax3 0.6 nozzle.json b/resources/profiles/X 3 Series/process/0.18mm Standard @XMax3 0.6 nozzle.json index 1216326..c28a107 100644 --- a/resources/profiles/X 3 Series/process/0.18mm Standard @XMax3 0.6 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.18mm Standard @XMax3 0.6 nozzle.json @@ -20,6 +20,8 @@ "overhang_3_4_speed": ["15"], "sparse_infill_line_width": "0.62", "sparse_infill_speed": ["100"], + "skin_infill_line_width": "0.62", + "skeleton_infill_line_width": "0.62", "support_bottom_z_distance": "0.18", "support_line_width": "0.62", "support_top_z_distance": "0.18", diff --git a/resources/profiles/X 3 Series/process/0.18mm Standard @XPlus3 0.6 nozzle.json b/resources/profiles/X 3 Series/process/0.18mm Standard @XPlus3 0.6 nozzle.json index cb65443..899759c 100644 --- a/resources/profiles/X 3 Series/process/0.18mm Standard @XPlus3 0.6 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.18mm Standard @XPlus3 0.6 nozzle.json @@ -20,6 +20,8 @@ "overhang_3_4_speed": ["15"], "sparse_infill_line_width": "0.62", "sparse_infill_speed": ["100"], + "skin_infill_line_width": "0.62", + "skeleton_infill_line_width": "0.62", "support_bottom_z_distance": "0.18", "support_line_width": "0.62", "support_top_z_distance": "0.18", diff --git a/resources/profiles/X 3 Series/process/0.18mm Standard @XSmart3 0.6 nozzle.json b/resources/profiles/X 3 Series/process/0.18mm Standard @XSmart3 0.6 nozzle.json index 5810401..1dc1159 100644 --- a/resources/profiles/X 3 Series/process/0.18mm Standard @XSmart3 0.6 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.18mm Standard @XSmart3 0.6 nozzle.json @@ -20,6 +20,8 @@ "overhang_3_4_speed": ["15"], "sparse_infill_line_width": "0.62", "sparse_infill_speed": ["100"], + "skin_infill_line_width": "0.62", + "skeleton_infill_line_width": "0.62", "support_bottom_z_distance": "0.18", "support_line_width": "0.62", "support_top_z_distance": "0.18", diff --git a/resources/profiles/X 3 Series/process/0.24mm Standard @XMax3 0.6 nozzle.json b/resources/profiles/X 3 Series/process/0.24mm Standard @XMax3 0.6 nozzle.json index 55ee304..e955f65 100644 --- a/resources/profiles/X 3 Series/process/0.24mm Standard @XMax3 0.6 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.24mm Standard @XMax3 0.6 nozzle.json @@ -18,6 +18,8 @@ "line_width": "0.62", "outer_wall_line_width": "0.62", "overhang_3_4_speed": ["15"], + "skin_infill_line_width": "0.62", + "skeleton_infill_line_width": "0.62", "sparse_infill_line_width": "0.62", "sparse_infill_speed": ["100"], "support_line_width": "0.62", diff --git a/resources/profiles/X 3 Series/process/0.24mm Standard @XMax3 0.8 nozzle.json b/resources/profiles/X 3 Series/process/0.24mm Standard @XMax3 0.8 nozzle.json index d583d84..277c5af 100644 --- a/resources/profiles/X 3 Series/process/0.24mm Standard @XMax3 0.8 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.24mm Standard @XMax3 0.8 nozzle.json @@ -20,6 +20,8 @@ "outer_wall_line_width": "0.82", "overhang_3_4_speed": ["25"], "overhang_4_4_speed": ["5"], + "skin_infill_line_width": "0.82", + "skeleton_infill_line_width": "0.82", "sparse_infill_line_width": "0.82", "sparse_infill_speed": ["100"], "support_line_width": "0.82", diff --git a/resources/profiles/X 3 Series/process/0.24mm Standard @XPlus3 0.6 nozzle.json b/resources/profiles/X 3 Series/process/0.24mm Standard @XPlus3 0.6 nozzle.json index 55a813e..e462cab 100644 --- a/resources/profiles/X 3 Series/process/0.24mm Standard @XPlus3 0.6 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.24mm Standard @XPlus3 0.6 nozzle.json @@ -18,6 +18,8 @@ "line_width": "0.62", "outer_wall_line_width": "0.62", "overhang_3_4_speed": ["15"], + "skin_infill_line_width": "0.62", + "skeleton_infill_line_width": "0.62", "sparse_infill_line_width": "0.62", "sparse_infill_speed": ["100"], "support_line_width": "0.62", diff --git a/resources/profiles/X 3 Series/process/0.24mm Standard @XPlus3 0.8 nozzle.json b/resources/profiles/X 3 Series/process/0.24mm Standard @XPlus3 0.8 nozzle.json index ca227c0..70d19d8 100644 --- a/resources/profiles/X 3 Series/process/0.24mm Standard @XPlus3 0.8 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.24mm Standard @XPlus3 0.8 nozzle.json @@ -20,6 +20,8 @@ "outer_wall_line_width": "0.82", "overhang_3_4_speed": ["25"], "overhang_4_4_speed": ["5"], + "skin_infill_line_width": "0.82", + "skeleton_infill_line_width": "0.82", "sparse_infill_line_width": "0.82", "sparse_infill_speed": ["100"], "support_line_width": "0.82", diff --git a/resources/profiles/X 3 Series/process/0.24mm Standard @XSmart3 0.6 nozzle.json b/resources/profiles/X 3 Series/process/0.24mm Standard @XSmart3 0.6 nozzle.json index 5954a54..7eec01e 100644 --- a/resources/profiles/X 3 Series/process/0.24mm Standard @XSmart3 0.6 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.24mm Standard @XSmart3 0.6 nozzle.json @@ -18,6 +18,8 @@ "line_width": "0.62", "outer_wall_line_width": "0.62", "overhang_3_4_speed": ["15"], + "skin_infill_line_width": "0.62", + "skeleton_infill_line_width": "0.62", "sparse_infill_line_width": "0.62", "sparse_infill_speed": ["100"], "support_line_width": "0.62", diff --git a/resources/profiles/X 3 Series/process/0.24mm Standard @XSmart3 0.8 nozzle.json b/resources/profiles/X 3 Series/process/0.24mm Standard @XSmart3 0.8 nozzle.json index a00d136..f627007 100644 --- a/resources/profiles/X 3 Series/process/0.24mm Standard @XSmart3 0.8 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.24mm Standard @XSmart3 0.8 nozzle.json @@ -20,6 +20,8 @@ "outer_wall_line_width": "0.82", "overhang_3_4_speed": ["25"], "overhang_4_4_speed": ["5"], + "skin_infill_line_width": "0.82", + "skeleton_infill_line_width": "0.82", "sparse_infill_line_width": "0.82", "sparse_infill_speed": ["100"], "support_line_width": "0.82", diff --git a/resources/profiles/X 3 Series/process/0.30mm Standard @XMax3 0.6 nozzle.json b/resources/profiles/X 3 Series/process/0.30mm Standard @XMax3 0.6 nozzle.json index 6419f30..d3666ff 100644 --- a/resources/profiles/X 3 Series/process/0.30mm Standard @XMax3 0.6 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.30mm Standard @XMax3 0.6 nozzle.json @@ -18,6 +18,8 @@ "line_width": "0.62", "outer_wall_line_width": "0.62", "overhang_3_4_speed": ["15"], + "skin_infill_line_width": "0.62", + "skeleton_infill_line_width": "0.62", "sparse_infill_line_width": "0.62", "sparse_infill_speed": ["100"], "support_line_width": "0.62", diff --git a/resources/profiles/X 3 Series/process/0.30mm Standard @XPlus3 0.6 nozzle.json b/resources/profiles/X 3 Series/process/0.30mm Standard @XPlus3 0.6 nozzle.json index 18fb201..d57c627 100644 --- a/resources/profiles/X 3 Series/process/0.30mm Standard @XPlus3 0.6 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.30mm Standard @XPlus3 0.6 nozzle.json @@ -18,6 +18,8 @@ "line_width": "0.62", "outer_wall_line_width": "0.62", "overhang_3_4_speed": ["15"], + "skin_infill_line_width": "0.62", + "skeleton_infill_line_width": "0.62", "sparse_infill_line_width": "0.62", "sparse_infill_speed": ["100"], "support_line_width": "0.62", diff --git a/resources/profiles/X 3 Series/process/0.30mm Standard @XSmart3 0.6 nozzle.json b/resources/profiles/X 3 Series/process/0.30mm Standard @XSmart3 0.6 nozzle.json index b68bcfe..29224a4 100644 --- a/resources/profiles/X 3 Series/process/0.30mm Standard @XSmart3 0.6 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.30mm Standard @XSmart3 0.6 nozzle.json @@ -18,6 +18,8 @@ "line_width": "0.62", "outer_wall_line_width": "0.62", "overhang_3_4_speed": ["15"], + "skin_infill_line_width": "0.62", + "skeleton_infill_line_width": "0.62", "sparse_infill_line_width": "0.62", "sparse_infill_speed": ["100"], "support_line_width": "0.62", diff --git a/resources/profiles/X 3 Series/process/0.30mm Strength @XMax3 0.6 nozzle.json b/resources/profiles/X 3 Series/process/0.30mm Strength @XMax3 0.6 nozzle.json index 19743ea..b5d1f24 100644 --- a/resources/profiles/X 3 Series/process/0.30mm Strength @XMax3 0.6 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.30mm Strength @XMax3 0.6 nozzle.json @@ -18,6 +18,8 @@ "line_width": "0.62", "outer_wall_line_width": "0.62", "overhang_3_4_speed": ["15"], + "skin_infill_line_width": "0.62", + "skeleton_infill_line_width": "0.62", "sparse_infill_density": "25%", "sparse_infill_line_width": "0.62", "sparse_infill_speed": ["100"], diff --git a/resources/profiles/X 3 Series/process/0.30mm Strength @XPlus3 0.6 nozzle.json b/resources/profiles/X 3 Series/process/0.30mm Strength @XPlus3 0.6 nozzle.json index e5fb952..4730063 100644 --- a/resources/profiles/X 3 Series/process/0.30mm Strength @XPlus3 0.6 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.30mm Strength @XPlus3 0.6 nozzle.json @@ -18,6 +18,8 @@ "line_width": "0.62", "outer_wall_line_width": "0.62", "overhang_3_4_speed": ["15"], + "skin_infill_line_width": "0.62", + "skeleton_infill_line_width": "0.62", "sparse_infill_density": "25%", "sparse_infill_line_width": "0.62", "sparse_infill_speed": ["100"], diff --git a/resources/profiles/X 3 Series/process/0.30mm Strength @XSmart3 0.6 nozzle.json b/resources/profiles/X 3 Series/process/0.30mm Strength @XSmart3 0.6 nozzle.json index 0b2d99c..9493d3f 100644 --- a/resources/profiles/X 3 Series/process/0.30mm Strength @XSmart3 0.6 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.30mm Strength @XSmart3 0.6 nozzle.json @@ -18,6 +18,8 @@ "line_width": "0.62", "outer_wall_line_width": "0.62", "overhang_3_4_speed": ["15"], + "skin_infill_line_width": "0.62", + "skeleton_infill_line_width": "0.62", "sparse_infill_density": "25%", "sparse_infill_line_width": "0.62", "sparse_infill_speed": ["100"], diff --git a/resources/profiles/X 3 Series/process/0.32mm Standard @XMax3 0.8 nozzle.json b/resources/profiles/X 3 Series/process/0.32mm Standard @XMax3 0.8 nozzle.json index 9456411..2ee4ad9 100644 --- a/resources/profiles/X 3 Series/process/0.32mm Standard @XMax3 0.8 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.32mm Standard @XMax3 0.8 nozzle.json @@ -19,6 +19,8 @@ "outer_wall_line_width": "0.82", "overhang_3_4_speed": ["25"], "overhang_4_4_speed": ["5"], + "skin_infill_line_width": "0.82", + "skeleton_infill_line_width": "0.82", "sparse_infill_line_width": "0.82", "sparse_infill_speed": ["100"], "support_line_width": "0.82", diff --git a/resources/profiles/X 3 Series/process/0.32mm Standard @XPlus3 0.8 nozzle.json b/resources/profiles/X 3 Series/process/0.32mm Standard @XPlus3 0.8 nozzle.json index 5f4db4a..bdc4eb8 100644 --- a/resources/profiles/X 3 Series/process/0.32mm Standard @XPlus3 0.8 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.32mm Standard @XPlus3 0.8 nozzle.json @@ -19,6 +19,8 @@ "outer_wall_line_width": "0.82", "overhang_3_4_speed": ["25"], "overhang_4_4_speed": ["5"], + "skin_infill_line_width": "0.82", + "skeleton_infill_line_width": "0.82", "sparse_infill_line_width": "0.82", "sparse_infill_speed": ["100"], "support_line_width": "0.82", diff --git a/resources/profiles/X 3 Series/process/0.32mm Standard @XSmart3 0.8 nozzle.json b/resources/profiles/X 3 Series/process/0.32mm Standard @XSmart3 0.8 nozzle.json index 0184518..722871d 100644 --- a/resources/profiles/X 3 Series/process/0.32mm Standard @XSmart3 0.8 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.32mm Standard @XSmart3 0.8 nozzle.json @@ -19,6 +19,8 @@ "outer_wall_line_width": "0.82", "overhang_3_4_speed": ["25"], "overhang_4_4_speed": ["5"], + "skin_infill_line_width": "0.82", + "skeleton_infill_line_width": "0.82", "sparse_infill_line_width": "0.82", "sparse_infill_speed": ["100"], "support_line_width": "0.82", diff --git a/resources/profiles/X 3 Series/process/0.36mm Standard @XMax3 0.6 nozzle.json b/resources/profiles/X 3 Series/process/0.36mm Standard @XMax3 0.6 nozzle.json index a62fd88..83fdddd 100644 --- a/resources/profiles/X 3 Series/process/0.36mm Standard @XMax3 0.6 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.36mm Standard @XMax3 0.6 nozzle.json @@ -18,6 +18,8 @@ "line_width": "0.62", "outer_wall_line_width": "0.62", "overhang_3_4_speed": ["15"], + "skin_infill_line_width": "0.62", + "skeleton_infill_line_width": "0.62", "sparse_infill_line_width": "0.62", "sparse_infill_speed": ["100"], "support_line_width": "0.62", diff --git a/resources/profiles/X 3 Series/process/0.36mm Standard @XPlus3 0.6 nozzle.json b/resources/profiles/X 3 Series/process/0.36mm Standard @XPlus3 0.6 nozzle.json index fbe4199..2301ff8 100644 --- a/resources/profiles/X 3 Series/process/0.36mm Standard @XPlus3 0.6 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.36mm Standard @XPlus3 0.6 nozzle.json @@ -18,6 +18,8 @@ "line_width": "0.62", "outer_wall_line_width": "0.62", "overhang_3_4_speed": ["15"], + "skin_infill_line_width": "0.62", + "skeleton_infill_line_width": "0.62", "sparse_infill_line_width": "0.62", "sparse_infill_speed": ["100"], "support_line_width": "0.62", diff --git a/resources/profiles/X 3 Series/process/0.36mm Standard @XSmart3 0.6 nozzle.json b/resources/profiles/X 3 Series/process/0.36mm Standard @XSmart3 0.6 nozzle.json index 0874d34..4f9880c 100644 --- a/resources/profiles/X 3 Series/process/0.36mm Standard @XSmart3 0.6 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.36mm Standard @XSmart3 0.6 nozzle.json @@ -18,6 +18,8 @@ "line_width": "0.62", "outer_wall_line_width": "0.62", "overhang_3_4_speed": ["15"], + "skin_infill_line_width": "0.62", + "skeleton_infill_line_width": "0.62", "sparse_infill_line_width": "0.62", "sparse_infill_speed": ["100"], "support_line_width": "0.62", diff --git a/resources/profiles/X 3 Series/process/0.40mm Standard @XMax3 0.8 nozzle.json b/resources/profiles/X 3 Series/process/0.40mm Standard @XMax3 0.8 nozzle.json index 309a591..225ab76 100644 --- a/resources/profiles/X 3 Series/process/0.40mm Standard @XMax3 0.8 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.40mm Standard @XMax3 0.8 nozzle.json @@ -19,6 +19,8 @@ "outer_wall_line_width": "0.82", "overhang_3_4_speed": ["25"], "overhang_4_4_speed": ["5"], + "skin_infill_line_width": "0.82", + "skeleton_infill_line_width": "0.82", "sparse_infill_line_width": "0.82", "sparse_infill_speed": ["100"], "support_line_width": "0.82", diff --git a/resources/profiles/X 3 Series/process/0.40mm Standard @XPlus3 0.8 nozzle.json b/resources/profiles/X 3 Series/process/0.40mm Standard @XPlus3 0.8 nozzle.json index 98edc23..7e35c9e 100644 --- a/resources/profiles/X 3 Series/process/0.40mm Standard @XPlus3 0.8 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.40mm Standard @XPlus3 0.8 nozzle.json @@ -19,6 +19,8 @@ "outer_wall_line_width": "0.82", "overhang_3_4_speed": ["25"], "overhang_4_4_speed": ["5"], + "skin_infill_line_width": "0.82", + "skeleton_infill_line_width": "0.82", "sparse_infill_line_width": "0.82", "sparse_infill_speed": ["100"], "support_line_width": "0.82", diff --git a/resources/profiles/X 3 Series/process/0.40mm Standard @XSmart3 0.8 nozzle.json b/resources/profiles/X 3 Series/process/0.40mm Standard @XSmart3 0.8 nozzle.json index e1d1e49..b8573e3 100644 --- a/resources/profiles/X 3 Series/process/0.40mm Standard @XSmart3 0.8 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.40mm Standard @XSmart3 0.8 nozzle.json @@ -19,6 +19,8 @@ "outer_wall_line_width": "0.82", "overhang_3_4_speed": ["25"], "overhang_4_4_speed": ["5"], + "skin_infill_line_width": "0.82", + "skeleton_infill_line_width": "0.82", "sparse_infill_line_width": "0.82", "sparse_infill_speed": ["100"], "support_line_width": "0.82", diff --git a/resources/profiles/X 3 Series/process/0.42mm Standard @XMax3 0.6 nozzle.json b/resources/profiles/X 3 Series/process/0.42mm Standard @XMax3 0.6 nozzle.json index 2e13cc1..ad54e50 100644 --- a/resources/profiles/X 3 Series/process/0.42mm Standard @XMax3 0.6 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.42mm Standard @XMax3 0.6 nozzle.json @@ -18,6 +18,8 @@ "line_width": "0.62", "outer_wall_line_width": "0.62", "overhang_3_4_speed": ["15"], + "skin_infill_line_width": "0.62", + "skeleton_infill_line_width": "0.62", "sparse_infill_line_width": "0.62", "sparse_infill_speed": ["100"], "support_line_width": "0.62", diff --git a/resources/profiles/X 3 Series/process/0.42mm Standard @XPlus3 0.6 nozzle.json b/resources/profiles/X 3 Series/process/0.42mm Standard @XPlus3 0.6 nozzle.json index e516491..6a36cb1 100644 --- a/resources/profiles/X 3 Series/process/0.42mm Standard @XPlus3 0.6 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.42mm Standard @XPlus3 0.6 nozzle.json @@ -18,6 +18,8 @@ "line_width": "0.62", "outer_wall_line_width": "0.62", "overhang_3_4_speed": ["15"], + "skin_infill_line_width": "0.62", + "skeleton_infill_line_width": "0.62", "sparse_infill_line_width": "0.62", "sparse_infill_speed": ["100"], "support_line_width": "0.62", diff --git a/resources/profiles/X 3 Series/process/0.42mm Standard @XSmart3 0.6 nozzle.json b/resources/profiles/X 3 Series/process/0.42mm Standard @XSmart3 0.6 nozzle.json index 91403b9..3110bd5 100644 --- a/resources/profiles/X 3 Series/process/0.42mm Standard @XSmart3 0.6 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.42mm Standard @XSmart3 0.6 nozzle.json @@ -18,6 +18,8 @@ "line_width": "0.62", "outer_wall_line_width": "0.62", "overhang_3_4_speed": ["15"], + "skin_infill_line_width": "0.62", + "skeleton_infill_line_width": "0.62", "sparse_infill_line_width": "0.62", "sparse_infill_speed": ["100"], "support_line_width": "0.62", diff --git a/resources/profiles/X 3 Series/process/0.48mm Standard @XMax3 0.8 nozzle.json b/resources/profiles/X 3 Series/process/0.48mm Standard @XMax3 0.8 nozzle.json index 9aee96a..3c4cfe2 100644 --- a/resources/profiles/X 3 Series/process/0.48mm Standard @XMax3 0.8 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.48mm Standard @XMax3 0.8 nozzle.json @@ -19,6 +19,8 @@ "outer_wall_line_width": "0.82", "overhang_3_4_speed": ["25"], "overhang_4_4_speed": ["5"], + "skin_infill_line_width": "0.82", + "skeleton_infill_line_width": "0.82", "sparse_infill_line_width": "0.82", "sparse_infill_speed": ["100"], "support_line_width": "0.82", diff --git a/resources/profiles/X 3 Series/process/0.48mm Standard @XPlus3 0.8 nozzle.json b/resources/profiles/X 3 Series/process/0.48mm Standard @XPlus3 0.8 nozzle.json index a152020..e515af8 100644 --- a/resources/profiles/X 3 Series/process/0.48mm Standard @XPlus3 0.8 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.48mm Standard @XPlus3 0.8 nozzle.json @@ -19,6 +19,8 @@ "outer_wall_line_width": "0.82", "overhang_3_4_speed": ["25"], "overhang_4_4_speed": ["5"], + "skin_infill_line_width": "0.82", + "skeleton_infill_line_width": "0.82", "sparse_infill_line_width": "0.82", "sparse_infill_speed": ["100"], "support_line_width": "0.82", diff --git a/resources/profiles/X 3 Series/process/0.48mm Standard @XSmart3 0.8 nozzle.json b/resources/profiles/X 3 Series/process/0.48mm Standard @XSmart3 0.8 nozzle.json index 4d9a294..d4d426f 100644 --- a/resources/profiles/X 3 Series/process/0.48mm Standard @XSmart3 0.8 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.48mm Standard @XSmart3 0.8 nozzle.json @@ -19,6 +19,8 @@ "outer_wall_line_width": "0.82", "overhang_3_4_speed": ["25"], "overhang_4_4_speed": ["5"], + "skin_infill_line_width": "0.82", + "skeleton_infill_line_width": "0.82", "sparse_infill_line_width": "0.82", "sparse_infill_speed": ["100"], "support_line_width": "0.82", diff --git a/resources/profiles/X 3 Series/process/0.56mm Standard @XMax3 0.8 nozzle.json b/resources/profiles/X 3 Series/process/0.56mm Standard @XMax3 0.8 nozzle.json index 04a8625..9d92ece 100644 --- a/resources/profiles/X 3 Series/process/0.56mm Standard @XMax3 0.8 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.56mm Standard @XMax3 0.8 nozzle.json @@ -19,6 +19,8 @@ "outer_wall_line_width": "0.82", "overhang_3_4_speed": ["25"], "overhang_4_4_speed": ["5"], + "skin_infill_line_width": "0.82", + "skeleton_infill_line_width": "0.82", "sparse_infill_line_width": "0.82", "sparse_infill_speed": ["100"], "support_line_width": "0.82", diff --git a/resources/profiles/X 3 Series/process/0.56mm Standard @XPlus3 0.8 nozzle.json b/resources/profiles/X 3 Series/process/0.56mm Standard @XPlus3 0.8 nozzle.json index 13ccab2..f937a32 100644 --- a/resources/profiles/X 3 Series/process/0.56mm Standard @XPlus3 0.8 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.56mm Standard @XPlus3 0.8 nozzle.json @@ -19,6 +19,8 @@ "outer_wall_line_width": "0.82", "overhang_3_4_speed": ["25"], "overhang_4_4_speed": ["5"], + "skin_infill_line_width": "0.82", + "skeleton_infill_line_width": "0.82", "sparse_infill_line_width": "0.82", "sparse_infill_speed": ["100"], "support_line_width": "0.82", diff --git a/resources/profiles/X 3 Series/process/0.56mm Standard @XSmart3 0.8 nozzle.json b/resources/profiles/X 3 Series/process/0.56mm Standard @XSmart3 0.8 nozzle.json index 8313e08..33bd564 100644 --- a/resources/profiles/X 3 Series/process/0.56mm Standard @XSmart3 0.8 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.56mm Standard @XSmart3 0.8 nozzle.json @@ -19,6 +19,8 @@ "outer_wall_line_width": "0.82", "overhang_3_4_speed": ["25"], "overhang_4_4_speed": ["5"], + "skin_infill_line_width": "0.82", + "skeleton_infill_line_width": "0.82", "sparse_infill_line_width": "0.82", "sparse_infill_speed": ["100"], "support_line_width": "0.82", diff --git a/resources/profiles/X 3 Series/process/fdm_process_common.json b/resources/profiles/X 3 Series/process/fdm_process_common.json index 9867436..0d736d1 100644 --- a/resources/profiles/X 3 Series/process/fdm_process_common.json +++ b/resources/profiles/X 3 Series/process/fdm_process_common.json @@ -4,6 +4,7 @@ "from": "system", "instantiation": "false", "adaptive_layer_height": "0", + "apply_top_surface_compensation": "0", "bottom_color_penetration_layers": "3", "bottom_shell_layers": "3", "bottom_shell_thickness": "0", @@ -21,6 +22,7 @@ "draft_shield": "disabled", "elefant_foot_compensation": "0", "enable_arc_fitting": "0", + "enable_height_slowdown": ["0"], "enable_overhang_speed": ["1"], "enable_prime_tower": "1", "enable_support": "0", @@ -28,6 +30,8 @@ "gap_infill_speed": ["50"], "infill_combination": "0", "infill_direction": "45", + "infill_rotate_step": "0", + "infill_lock_depth": "1.0", "infill_wall_overlap": "15%", "initial_layer_acceleration": ["500"], "initial_layer_infill_speed": ["105"], @@ -48,8 +52,14 @@ "ironing_type": "no ironing", "layer_height": "0.2", "line_width": "0.42", + "locked_skin_infill_pattern": "crosszag", + "locked_skeleton_infill_pattern": "zigzag", "max_travel_detour_distance": "0", + "machine_prepare_compensation_time": "260", "minimum_sparse_infill_area": "15", + "nozzle_flush_dataset": [ + "0" + ], "only_one_wall_top": "1", "outer_wall_acceleration": ["3000"], "outer_wall_line_width": "0.42", @@ -59,6 +69,7 @@ "overhang_3_4_speed": ["30"], "overhang_4_4_speed": ["10"], "overhang_totally_speed": ["10"], + "override_filament_scarf_seam_setting": "0", "prime_tower_width": "35", "print_sequence": "by layer", "print_settings_id": "", @@ -67,9 +78,32 @@ "reduce_infill_retraction": "1", "resolution": "0.012", "seam_position": "aligned", + "seam_placement_away_from_overhangs": "0", + "skeleton_infill_density": "15%", + "skin_infill_density": "15%", + "skin_infill_depth": "2.0", + "skin_infill_line_width": "0.45", "skirt_distance": "2", "skirt_height": "1", "skirt_loops": "0", + "slowdown_start_height": [ + "0" + ], + "slowdown_start_speed": [ + "1000" + ], + "slowdown_start_acc": [ + "100000" + ], + "slowdown_end_height": [ + "400" + ], + "slowdown_end_speed": [ + "1000" + ], + "slowdown_end_acc": [ + "100000" + ], "small_perimeter_speed": ["50%"], "small_perimeter_threshold": ["4"], "smooth_coefficient": "90", @@ -100,6 +134,11 @@ "support_threshold_angle": "30", "support_top_z_distance": "0.2", "support_type": "tree(auto)", + "seam_slope_type": "none", + "seam_slope_start_height": "10%", + "seam_slope_gap": "0", + "seam_slope_min_length": "10", + "symmetric_infill_y_axis": "0", "top_color_penetration_layers": "3", "top_shell_layers": "3", "top_shell_thickness": "0.8", @@ -119,5 +158,14 @@ "wipe_tower_no_sparse_layers": "0", "xy_contour_compensation": "0", "xy_hole_compensation": "0", + "z_direction_outwall_speed_continuous": "0", + "enable_circle_compensation": "0", + "circle_compensation_manual_offset": "0", + "infill_shift_step": "0.4", + "prime_tower_enable_framework": "0", + "prime_tower_lift_speed": "90", + "prime_tower_lift_height": "-1", + "prime_tower_max_speed": "90", + "prime_tower_flat_ironing":"0", "compatible_printers": [] } diff --git a/resources/profiles/X 4 Series/filament/QIDI PETG Tough.json b/resources/profiles/X 4 Series/filament/QIDI PETG Tough.json index cd09fbf..309d327 100644 --- a/resources/profiles/X 4 Series/filament/QIDI PETG Tough.json +++ b/resources/profiles/X 4 Series/filament/QIDI PETG Tough.json @@ -1,6 +1,6 @@ { "type": "filament", - "filament_id": "QD_0_1_41", + "filament_id": "QD_0_1_40", "setting_id": "GFSG99", "name": "QIDI PETG Tough@X4", "from": "system", diff --git a/resources/profiles/X 4 Series/machine/Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/X 4 Series/machine/Qidi X-Plus 4 0.4 nozzle.json index d0d3fc5..0c9ad22 100644 --- a/resources/profiles/X 4 Series/machine/Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/X 4 Series/machine/Qidi X-Plus 4 0.4 nozzle.json @@ -11,7 +11,7 @@ "default_print_profile": "0.20mm Standard @XPlus4", "printer_settings_id": "Qidi", "bed_exclude_area": ["0x305", "0x302", "35x302", "35x305", "305x305", "305x305", "305x305", "305x20", "293x20", "293x0", "305x0", "305x20", "305x305"], - "change_filament_gcode": "G1 Z{max_layer_z + 3.0} F1200\nTOOL_CHANGE_START F=[current_extruder] T=[next_extruder]\nDISABLE_ALL_SENSOR\n{if long_retractions_when_cut[previous_extruder]}\nMOVE_TO_TRASH\nG1 E-{retraction_distances_when_cut[previous_extruder]} F{old_filament_e_feedrate}\nM400\n{else}\nG1 E-5 F{old_filament_e_feedrate}\n{endif}\nCUT_FILAMENT T=[current_extruder]\nMOVE_TO_TRASH\n{if nozzle_temperature_range_high[current_extruder] >= nozzle_temperature_range_high[next_extruder]}\nM104 S{nozzle_temperature_range_high[current_extruder]}\n{else}\nM104 S{nozzle_temperature_range_high[next_extruder]}\n{endif}\nM106 S0\nM106 P2 S0\nUNLOAD_T[current_extruder]\nG92 E0\nM83\n; FLUSH_START\nG1 E1 F50\nG1 E17 F{old_filament_e_feedrate}\n; FLUSH_END\nT[next_extruder]\nG1 E1 F50\n{if nozzle_temperature_range_high[current_extruder] >= nozzle_temperature_range_high[next_extruder]}\n{if filament_type[current_extruder] == \"PETG\"}\nSET_HEATER_TEMPERATURE HEATER=extruder TARGET=260 WAIT=1\n{else}\nSET_HEATER_TEMPERATURE HEATER=extruder TARGET={nozzle_temperature_range_high[current_extruder]} WAIT=1\n{endif}\n{else}\n{if filament_type[next_extruder] == \"PETG\"}\nSET_HEATER_TEMPERATURE HEATER=extruder TARGET=260 WAIT=1\n{else}\nSET_HEATER_TEMPERATURE HEATER=extruder TARGET={nozzle_temperature_range_high[next_extruder]} WAIT=1\n{endif}\n{endif}\n{if long_retractions_when_cut[previous_extruder]}\nG1 E{retraction_distances_when_cut[previous_extruder]} F{old_filament_e_feedrate}\nM400\n{endif}\n; FLUSH_START\nG1 E{48.5 * 0.58} F{old_filament_e_feedrate}\nG1 E{48.5 * 0.02} F50\nG1 E{48.5 * 0.18} F{old_filament_e_feedrate}\nG1 E{48.5 * 0.02} F50\nG1 E{48.5 * 0.18} F{old_filament_e_feedrate}\nG1 E{48.5 * 0.02} F50\nG1 E-[old_retract_length_toolchange] F1800\n; FLUSH_END\n{if flush_length_1 > 1}\nM106 S255\nM400\nG91\nG1 X-5 F60\nG1 X5 F60\nG90\nCLEAR_FLUSH\nM106 S60\n; FLUSH_START\nG1 E[old_retract_length_toolchange] F300\nG1 E{flush_length_1 * 0.58} F{new_filament_e_feedrate}\nG1 E{flush_length_1 * 0.02} F50\nG1 E{flush_length_1 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_1 * 0.02} F50\nG1 E{flush_length_1 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_1 * 0.02} F50\nG1 E-[old_retract_length_toolchange] F1800\n; FLUSH_END\n{endif}\n{if flush_length_2 > 1}\nM106 S255\nM400\nG91\nG1 X-5 F60\nG1 X5 F60\nG90\nCLEAR_FLUSH\nM106 S60\n; FLUSH_START\nG1 E[old_retract_length_toolchange] F300\nG1 E{flush_length_2 * 0.58} F{new_filament_e_feedrate}\nG1 E{flush_length_2 * 0.02} F50\nG1 E{flush_length_2 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_2 * 0.02} F50\nG1 E{flush_length_2 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_2 * 0.02} F50\nG1 E-[new_retract_length_toolchange] F1800\n; FLUSH_END\n{endif}\n{if flush_length_3 > 1}\nM106 S255\nM400\nG91\nG1 X-5 F60\nG1 X5 F60\nG90\nCLEAR_FLUSH\nM106 S60\n; FLUSH_START\nG1 E[new_retract_length_toolchange] F300\nG1 E{flush_length_3 * 0.58} F{new_filament_e_feedrate}\nG1 E{flush_length_3 * 0.02} F50\nG1 E{flush_length_3 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_3 * 0.02} F50\nG1 E{flush_length_3 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_3 * 0.02} F50\nG1 E-[new_retract_length_toolchange] F1800\n; FLUSH_END\n{endif}\n{if flush_length_4 > 1}\nM106 S255\nM400\nG91\nG1 X-5 F60\nG1 X5 F60\nG90\nCLEAR_FLUSH\nM106 S60\n; FLUSH_START\nG1 E[new_retract_length_toolchange] F300\nG1 E{flush_length_4 * 0.58} F{new_filament_e_feedrate}\nG1 E{flush_length_4 * 0.02} F50\nG1 E{flush_length_4 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_4 * 0.02} F50\nG1 E{flush_length_4 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_4 * 0.02} F50\nG1 E-[new_retract_length_toolchange] F1800\n; FLUSH_END\n{endif}\nM104 S[new_filament_temp]\nM106 S255\nM400\nG91\nG1 X-5 F60\nG1 X5 F60\nG90\nM109 S[new_filament_temp]\nG92 E0\nM400\nCLEAR_FLUSH\nCLEAR_OOZE\nM106 S0\nG1 Y300 F9000\nTOOL_CHANGE_END\nENABLE_ALL_SENSOR", + "change_filament_gcode": "{if max_layer_z < 12}\nG1 Z15 F1200\n{else}\nG1 Z{max_layer_z + 3.0} F1200\n{endif}\nTOOL_CHANGE_START F=[current_extruder] T=[next_extruder]\nDISABLE_ALL_SENSOR\n{if long_retractions_when_cut[previous_extruder]}\nMOVE_TO_TRASH\nG1 E-{retraction_distances_when_cut[previous_extruder]} F{old_filament_e_feedrate}\nM400\n{else}\nG1 E-5 F{old_filament_e_feedrate}\n{endif}\nCUT_FILAMENT T=[current_extruder]\nMOVE_TO_TRASH\nM400\n{if nozzle_temperature_range_high[current_extruder] >= nozzle_temperature_range_high[next_extruder]}\nM104 S{nozzle_temperature_range_high[current_extruder]}\n{else}\nM104 S{nozzle_temperature_range_high[next_extruder]}\n{endif}\nM106 S0\nM106 P2 S0\nUNLOAD_T[current_extruder]\nG92 E0\nM83\nG1 E2 F50\nT[next_extruder]\n{if nozzle_temperature_range_high[current_extruder] >= nozzle_temperature_range_high[next_extruder]}\nSET_HEATER_TEMPERATURE HEATER=extruder TARGET={nozzle_temperature_range_high[current_extruder]} WAIT=1\n{else}\nSET_HEATER_TEMPERATURE HEATER=extruder TARGET={nozzle_temperature_range_high[next_extruder]} WAIT=1\n{endif}\n{if long_retractions_when_cut[previous_extruder]}\nG1 E{retraction_distances_when_cut[previous_extruder]} F{old_filament_e_feedrate}\n{endif}\nM400\nM106 S60\n; FLUSH_START\nG1 E1 F50\nG1 E{65.5 * 0.58} F{old_filament_e_feedrate}\nG1 E{65.5 * 0.02} F50\nG1 E{65.5 * 0.18} F{old_filament_e_feedrate}\nG1 E{65.5 * 0.02} F50\nG1 E{65.5 * 0.18} F{old_filament_e_feedrate}\nG1 E{65.5 * 0.02} F50\nG1 E-[old_retract_length_toolchange] F1800\n; FLUSH_END\n{if flush_length_1 > 1}\nM400\nM106 S255\nG91\nG1 X-5 F60\nG1 X5 F60\nG90\nCLEAR_FLUSH\nM106 S60\n; FLUSH_START\nG1 E[old_retract_length_toolchange] F300\nG1 E{flush_length_1 * 0.58} F{new_filament_e_feedrate}\nG1 E{flush_length_1 * 0.02} F50\nG1 E{flush_length_1 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_1 * 0.02} F50\nG1 E{flush_length_1 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_1 * 0.02} F50\nG1 E-[old_retract_length_toolchange] F1800\n; FLUSH_END\n{endif}\n{if flush_length_2 > 1}\nM400\nM106 S255\nG91\nG1 X-5 F60\nG1 X5 F60\nG90\nCLEAR_FLUSH\nM106 S60\n; FLUSH_START\nG1 E[old_retract_length_toolchange] F300\nG1 E{flush_length_2 * 0.58} F{new_filament_e_feedrate}\nG1 E{flush_length_2 * 0.02} F50\nG1 E{flush_length_2 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_2 * 0.02} F50\nG1 E{flush_length_2 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_2 * 0.02} F50\nG1 E-[new_retract_length_toolchange] F1800\n; FLUSH_END\n{endif}\n{if flush_length_3 > 1}\nM400\nM106 S255\nG91\nG1 X-5 F60\nG1 X5 F60\nG90\nCLEAR_FLUSH\nM106 S60\n; FLUSH_START\nG1 E[new_retract_length_toolchange] F300\nG1 E{flush_length_3 * 0.58} F{new_filament_e_feedrate}\nG1 E{flush_length_3 * 0.02} F50\nG1 E{flush_length_3 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_3 * 0.02} F50\nG1 E{flush_length_3 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_3 * 0.02} F50\nG1 E-[new_retract_length_toolchange] F1800\n; FLUSH_END\n{endif}\n{if flush_length_4 > 1}\nM400\nM106 S255\nG91\nG1 X-5 F60\nG1 X5 F60\nG90\nCLEAR_FLUSH\nM106 S60\n; FLUSH_START\nG1 E[new_retract_length_toolchange] F300\nG1 E{flush_length_4 * 0.58} F{new_filament_e_feedrate}\nG1 E{flush_length_4 * 0.02} F50\nG1 E{flush_length_4 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_4 * 0.02} F50\nG1 E{flush_length_4 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_4 * 0.02} F50\nG1 E-[new_retract_length_toolchange] F1800\n; FLUSH_END\n{endif}\nM104 S[new_filament_temp]\nM400\nM106 S255\nG91\nG1 X-5 F60\nG1 X5 F60\nG90\nM109 S[new_filament_temp]\nG92 E0\nM400\nCLEAR_FLUSH\nCLEAR_OOZE\nM400\nM106 S0\nTOOL_CHANGE_END\nG1 Y305 F9000\nENABLE_ALL_SENSOR", "default_filament_profile": ["QIDI PLA Rapido @Qidi X-Plus 4 0.4 nozzle"], "enable_long_retraction_when_cut": "2", "extruder_clearance_height_to_lid": "135", @@ -23,7 +23,7 @@ "machine_load_filament_time": "35", "machine_pause_gcode": "M0", "machine_start_gcode": "PRINT_START BED=[bed_temperature_initial_layer_single] HOTEND=[nozzle_temperature_initial_layer] CHAMBER=[chamber_temperatures] EXTRUDER=[initial_no_support_extruder]\nSET_PRINT_STATS_INFO TOTAL_LAYER=[total_layer_count]\nM83\nM140 S[bed_temperature_initial_layer_single]\nM104 S[nozzle_temperature_initial_layer]\nM141 S[chamber_temperatures]\nG4 P3000\nT[initial_tool]\nG0 X{max((min(print_bed_max[0] - 12, first_layer_print_min[0] + 80) - 85), 0)} Y{max((min(print_bed_max[1] - 3, first_layer_print_min[1] + 80) - 85), 0)} Z5 F6000\nG0 Z[initial_layer_print_height] F600\nG1 E3 F1800\nG1 X{(min(print_bed_max[0] - 12, first_layer_print_min[0] + 80))} E{85 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 Y{max((min(print_bed_max[1] - 3, first_layer_print_min[1] + 80) - 85), 0) + 2} E{2 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 X{max((min(print_bed_max[0] - 12, first_layer_print_min[0] + 80) - 85), 0)} E{85 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 Y{max((min(print_bed_max[1] - 3, first_layer_print_min[1] + 80) - 85), 0) + 85} E{83 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 X{max((min(print_bed_max[0] - 12, first_layer_print_min[0] + 80) - 85), 0) + 2} E{2 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 Y{max((min(print_bed_max[1] - 3, first_layer_print_min[1] + 80) - 85), 0) + 3} E{82 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 X{max((min(print_bed_max[0] - 12, first_layer_print_min[0] + 80) - 85), 0) + 3} Z0\nG1 X{max((min(print_bed_max[0] - 12, first_layer_print_min[0] + 80) - 85), 0) + 6}\nG1 Z1 F600\nSET_PRINT_STATS_INFO CURRENT_LAYER=1", - "machine_unload_filament_time": "30", + "machine_unload_filament_time": "35", "nozzle_diameter": ["0.4"], "nozzle_volume": ["122"], "printable_area": ["0x0","305x0","305x305","0x305"], diff --git a/resources/profiles/X 4 Series/machine/fdm_machine_x_common.json b/resources/profiles/X 4 Series/machine/fdm_machine_x_common.json index bb12d4b..4a3ac24 100644 --- a/resources/profiles/X 4 Series/machine/fdm_machine_x_common.json +++ b/resources/profiles/X 4 Series/machine/fdm_machine_x_common.json @@ -38,7 +38,7 @@ "machine_pause_gcode": "M0", "machine_start_gcode": "PRINT_START BED=[bed_temperature_initial_layer_single] HOTEND=[nozzle_temperature_initial_layer] CHAMBER=[chamber_temperatures]\nSET_PRINT_STATS_INFO TOTAL_LAYER=[total_layer_count]\nM83\nM140 S[bed_temperature_initial_layer_single]\nM104 S[nozzle_temperature_initial_layer]\nM141 S[chamber_temperatures]\nG4 P3000\nT[initial_tool]\nG0 X{max((min(print_bed_max[0] - 12, first_layer_print_min[0] + 80) - 85), 0)} Y{max((min(print_bed_max[1] - 3, first_layer_print_min[1] + 80) - 85), 0)} Z5 F6000\nG0 Z[initial_layer_print_height] F600\nG1 E3 F1800\nG1 X{(min(print_bed_max[0] - 12, first_layer_print_min[0] + 80))} E{85 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 Y{max((min(print_bed_max[1] - 3, first_layer_print_min[1] + 80) - 85), 0) + 2} E{2 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 X{max((min(print_bed_max[0] - 12, first_layer_print_min[0] + 80) - 85), 0)} E{85 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 Y{max((min(print_bed_max[1] - 3, first_layer_print_min[1] + 80) - 85), 0) + 85} E{83 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 X{max((min(print_bed_max[0] - 12, first_layer_print_min[0] + 80) - 85), 0) + 2} E{2 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 Y{max((min(print_bed_max[1] - 3, first_layer_print_min[1] + 80) - 85), 0) + 3} E{82 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 X{max((min(print_bed_max[0] - 12, first_layer_print_min[0] + 80) - 85), 0) + 3} Z0\nG1 X{max((min(print_bed_max[0] - 12, first_layer_print_min[0] + 80) - 85), 0) + 6}\nG1 Z1 F600\nSET_PRINT_STATS_INFO CURRENT_LAYER=1", "machine_switch_extruder_time": "0", - "machine_unload_filament_time": "30", + "machine_unload_filament_time": "35", "max_layer_height": ["0.28"], "min_layer_height": ["0.08"], "nozzle_diameter": ["0.4"], diff --git a/resources/profiles/X 4 Series/process/0.06mm High Quality @XPlus4 0.2 nozzle.json b/resources/profiles/X 4 Series/process/0.06mm High Quality @XPlus4 0.2 nozzle.json index 65292a7..71797ed 100644 --- a/resources/profiles/X 4 Series/process/0.06mm High Quality @XPlus4 0.2 nozzle.json +++ b/resources/profiles/X 4 Series/process/0.06mm High Quality @XPlus4 0.2 nozzle.json @@ -21,6 +21,8 @@ "outer_wall_acceleration": ["2000"], "outer_wall_line_width": "0.22", "outer_wall_speed": ["60"], + "skin_infill_line_width": "0.22", + "skeleton_infill_line_width": "0.22", "sparse_infill_line_width": "0.22", "sparse_infill_pattern": "gyroid", "sparse_infill_speed": ["100"], diff --git a/resources/profiles/X 4 Series/process/0.06mm Standard @XPlus4 0.2 nozzle.json b/resources/profiles/X 4 Series/process/0.06mm Standard @XPlus4 0.2 nozzle.json index 2f34c8b..50aca53 100644 --- a/resources/profiles/X 4 Series/process/0.06mm Standard @XPlus4 0.2 nozzle.json +++ b/resources/profiles/X 4 Series/process/0.06mm Standard @XPlus4 0.2 nozzle.json @@ -18,6 +18,8 @@ "layer_height": "0.06", "line_width": "0.22", "outer_wall_line_width": "0.22", + "skin_infill_line_width": "0.22", + "skeleton_infill_line_width": "0.22", "sparse_infill_line_width": "0.22", "sparse_infill_speed": ["100"], "support_bottom_z_distance": "0.06", diff --git a/resources/profiles/X 4 Series/process/0.08mm High Quality @XPlus4 0.2 nozzle.json b/resources/profiles/X 4 Series/process/0.08mm High Quality @XPlus4 0.2 nozzle.json index 6e3dd1c..4d78b16 100644 --- a/resources/profiles/X 4 Series/process/0.08mm High Quality @XPlus4 0.2 nozzle.json +++ b/resources/profiles/X 4 Series/process/0.08mm High Quality @XPlus4 0.2 nozzle.json @@ -21,6 +21,8 @@ "outer_wall_acceleration": ["2000"], "outer_wall_line_width": "0.22", "outer_wall_speed": ["60"], + "skin_infill_line_width": "0.22", + "skeleton_infill_line_width": "0.22", "sparse_infill_line_width": "0.22", "sparse_infill_pattern": "gyroid", "sparse_infill_speed": ["100"], diff --git a/resources/profiles/X 4 Series/process/0.08mm Standard @XPlus4 0.2 nozzle.json b/resources/profiles/X 4 Series/process/0.08mm Standard @XPlus4 0.2 nozzle.json index fb8393f..49bc384 100644 --- a/resources/profiles/X 4 Series/process/0.08mm Standard @XPlus4 0.2 nozzle.json +++ b/resources/profiles/X 4 Series/process/0.08mm Standard @XPlus4 0.2 nozzle.json @@ -18,6 +18,8 @@ "layer_height": "0.08", "line_width": "0.22", "outer_wall_line_width": "0.22", + "skin_infill_line_width": "0.22", + "skeleton_infill_line_width": "0.22", "sparse_infill_line_width": "0.22", "sparse_infill_speed": ["100"], "support_bottom_z_distance": "0.08", diff --git a/resources/profiles/X 4 Series/process/0.10mm High Quality @XPlus4 0.2 nozzle.json b/resources/profiles/X 4 Series/process/0.10mm High Quality @XPlus4 0.2 nozzle.json index 7f60838..aef8a8f 100644 --- a/resources/profiles/X 4 Series/process/0.10mm High Quality @XPlus4 0.2 nozzle.json +++ b/resources/profiles/X 4 Series/process/0.10mm High Quality @XPlus4 0.2 nozzle.json @@ -21,6 +21,8 @@ "outer_wall_acceleration": ["2000"], "outer_wall_line_width": "0.22", "outer_wall_speed": ["60"], + "skin_infill_line_width": "0.22", + "skeleton_infill_line_width": "0.22", "sparse_infill_line_width": "0.22", "sparse_infill_pattern": "gyroid", "sparse_infill_speed": ["100"], diff --git a/resources/profiles/X 4 Series/process/0.10mm Standard @XPlus4 0.2 nozzle.json b/resources/profiles/X 4 Series/process/0.10mm Standard @XPlus4 0.2 nozzle.json index 5950818..e085bc8 100644 --- a/resources/profiles/X 4 Series/process/0.10mm Standard @XPlus4 0.2 nozzle.json +++ b/resources/profiles/X 4 Series/process/0.10mm Standard @XPlus4 0.2 nozzle.json @@ -18,6 +18,8 @@ "layer_height": "0.1", "line_width": "0.22", "outer_wall_line_width": "0.22", + "skin_infill_line_width": "0.22", + "skeleton_infill_line_width": "0.22", "sparse_infill_line_width": "0.22", "sparse_infill_speed": ["100"], "support_bottom_z_distance": "0.1", diff --git a/resources/profiles/X 4 Series/process/0.12mm Standard @XPlus4 0.2 nozzle.json b/resources/profiles/X 4 Series/process/0.12mm Standard @XPlus4 0.2 nozzle.json index 14e9ef3..8763b4d 100644 --- a/resources/profiles/X 4 Series/process/0.12mm Standard @XPlus4 0.2 nozzle.json +++ b/resources/profiles/X 4 Series/process/0.12mm Standard @XPlus4 0.2 nozzle.json @@ -18,6 +18,8 @@ "layer_height": "0.12", "line_width": "0.22", "outer_wall_line_width": "0.22", + "skin_infill_line_width": "0.22", + "skeleton_infill_line_width": "0.22", "sparse_infill_line_width": "0.22", "sparse_infill_speed": ["100"], "support_bottom_z_distance": "0.12", diff --git a/resources/profiles/X 4 Series/process/0.14mm Standard @XPlus4 0.2 nozzle.json b/resources/profiles/X 4 Series/process/0.14mm Standard @XPlus4 0.2 nozzle.json index 2608452..fb3e2f1 100644 --- a/resources/profiles/X 4 Series/process/0.14mm Standard @XPlus4 0.2 nozzle.json +++ b/resources/profiles/X 4 Series/process/0.14mm Standard @XPlus4 0.2 nozzle.json @@ -18,6 +18,8 @@ "layer_height": "0.14", "line_width": "0.22", "outer_wall_line_width": "0.22", + "skin_infill_line_width": "0.22", + "skeleton_infill_line_width": "0.22", "sparse_infill_line_width": "0.22", "sparse_infill_speed": ["100"], "support_bottom_z_distance": "0.14", diff --git a/resources/profiles/X 4 Series/process/0.18mm Standard @XPlus4 0.6 nozzle.json b/resources/profiles/X 4 Series/process/0.18mm Standard @XPlus4 0.6 nozzle.json index 36d5e3c..a3ba483 100644 --- a/resources/profiles/X 4 Series/process/0.18mm Standard @XPlus4 0.6 nozzle.json +++ b/resources/profiles/X 4 Series/process/0.18mm Standard @XPlus4 0.6 nozzle.json @@ -18,6 +18,8 @@ "line_width": "0.62", "outer_wall_line_width": "0.62", "overhang_3_4_speed": ["15"], + "skin_infill_line_width": "0.62", + "skeleton_infill_line_width": "0.62", "sparse_infill_line_width": "0.62", "sparse_infill_speed": ["100"], "support_bottom_z_distance": "0.18", diff --git a/resources/profiles/X 4 Series/process/0.24mm Standard @XPlus4 0.6 nozzle.json b/resources/profiles/X 4 Series/process/0.24mm Standard @XPlus4 0.6 nozzle.json index d24d603..ba1c189 100644 --- a/resources/profiles/X 4 Series/process/0.24mm Standard @XPlus4 0.6 nozzle.json +++ b/resources/profiles/X 4 Series/process/0.24mm Standard @XPlus4 0.6 nozzle.json @@ -18,6 +18,8 @@ "line_width": "0.62", "outer_wall_line_width": "0.62", "overhang_3_4_speed": ["15"], + "skin_infill_line_width": "0.62", + "skeleton_infill_line_width": "0.62", "sparse_infill_line_width": "0.62", "sparse_infill_speed": ["100"], "support_line_width": "0.62", diff --git a/resources/profiles/X 4 Series/process/0.24mm Standard @XPlus4 0.8 nozzle.json b/resources/profiles/X 4 Series/process/0.24mm Standard @XPlus4 0.8 nozzle.json index f17966f..b3e1c87 100644 --- a/resources/profiles/X 4 Series/process/0.24mm Standard @XPlus4 0.8 nozzle.json +++ b/resources/profiles/X 4 Series/process/0.24mm Standard @XPlus4 0.8 nozzle.json @@ -20,6 +20,8 @@ "outer_wall_line_width": "0.82", "overhang_3_4_speed": ["25"], "overhang_4_4_speed": ["5"], + "skin_infill_line_width": "0.82", + "skeleton_infill_line_width": "0.82", "sparse_infill_line_width": "0.82", "sparse_infill_speed": ["100"], "support_line_width": "0.82", diff --git a/resources/profiles/X 4 Series/process/0.30mm Standard @XPlus4 0.6 nozzle.json b/resources/profiles/X 4 Series/process/0.30mm Standard @XPlus4 0.6 nozzle.json index 685d9b4..3284283 100644 --- a/resources/profiles/X 4 Series/process/0.30mm Standard @XPlus4 0.6 nozzle.json +++ b/resources/profiles/X 4 Series/process/0.30mm Standard @XPlus4 0.6 nozzle.json @@ -18,6 +18,8 @@ "line_width": "0.62", "outer_wall_line_width": "0.62", "overhang_3_4_speed": ["15"], + "skin_infill_line_width": "0.62", + "skeleton_infill_line_width": "0.62", "sparse_infill_line_width": "0.62", "sparse_infill_speed": ["100"], "support_line_width": "0.62", diff --git a/resources/profiles/X 4 Series/process/0.30mm Strength @XPlus4 0.6 nozzle.json b/resources/profiles/X 4 Series/process/0.30mm Strength @XPlus4 0.6 nozzle.json index 26c229b..95698c7 100644 --- a/resources/profiles/X 4 Series/process/0.30mm Strength @XPlus4 0.6 nozzle.json +++ b/resources/profiles/X 4 Series/process/0.30mm Strength @XPlus4 0.6 nozzle.json @@ -18,6 +18,8 @@ "line_width": "0.62", "outer_wall_line_width": "0.62", "overhang_3_4_speed": ["15"], + "skin_infill_line_width": "0.62", + "skeleton_infill_line_width": "0.62", "sparse_infill_density": "25%", "sparse_infill_line_width": "0.62", "sparse_infill_speed": ["100"], diff --git a/resources/profiles/X 4 Series/process/0.32mm Standard @XPlus4 0.8 nozzle.json b/resources/profiles/X 4 Series/process/0.32mm Standard @XPlus4 0.8 nozzle.json index dc66e19..55c6117 100644 --- a/resources/profiles/X 4 Series/process/0.32mm Standard @XPlus4 0.8 nozzle.json +++ b/resources/profiles/X 4 Series/process/0.32mm Standard @XPlus4 0.8 nozzle.json @@ -19,6 +19,8 @@ "outer_wall_line_width": "0.82", "overhang_3_4_speed": ["25"], "overhang_4_4_speed": ["5"], + "skin_infill_line_width": "0.82", + "skeleton_infill_line_width": "0.82", "sparse_infill_line_width": "0.82", "sparse_infill_speed": ["100"], "support_line_width": "0.82", diff --git a/resources/profiles/X 4 Series/process/0.36mm Standard @XPlus4 0.6 nozzle.json b/resources/profiles/X 4 Series/process/0.36mm Standard @XPlus4 0.6 nozzle.json index 8d5d448..91ad56e 100644 --- a/resources/profiles/X 4 Series/process/0.36mm Standard @XPlus4 0.6 nozzle.json +++ b/resources/profiles/X 4 Series/process/0.36mm Standard @XPlus4 0.6 nozzle.json @@ -18,6 +18,8 @@ "line_width": "0.62", "outer_wall_line_width": "0.62", "overhang_3_4_speed": ["15"], + "skin_infill_line_width": "0.62", + "skeleton_infill_line_width": "0.62", "sparse_infill_line_width": "0.62", "sparse_infill_speed": ["100"], "support_line_width": "0.62", diff --git a/resources/profiles/X 4 Series/process/0.40mm Standard @XPlus4 0.8 nozzle.json b/resources/profiles/X 4 Series/process/0.40mm Standard @XPlus4 0.8 nozzle.json index 32a712d..a20c192 100644 --- a/resources/profiles/X 4 Series/process/0.40mm Standard @XPlus4 0.8 nozzle.json +++ b/resources/profiles/X 4 Series/process/0.40mm Standard @XPlus4 0.8 nozzle.json @@ -19,6 +19,8 @@ "outer_wall_line_width": "0.82", "overhang_3_4_speed": ["25"], "overhang_4_4_speed": ["5"], + "skin_infill_line_width": "0.82", + "skeleton_infill_line_width": "0.82", "sparse_infill_line_width": "0.82", "sparse_infill_speed": ["100"], "support_line_width": "0.82", diff --git a/resources/profiles/X 4 Series/process/0.42mm Standard @XPlus4 0.6 nozzle.json b/resources/profiles/X 4 Series/process/0.42mm Standard @XPlus4 0.6 nozzle.json index d7b57f6..a4dd1cf 100644 --- a/resources/profiles/X 4 Series/process/0.42mm Standard @XPlus4 0.6 nozzle.json +++ b/resources/profiles/X 4 Series/process/0.42mm Standard @XPlus4 0.6 nozzle.json @@ -18,6 +18,8 @@ "line_width": "0.62", "outer_wall_line_width": "0.62", "overhang_3_4_speed": ["15"], + "skin_infill_line_width": "0.62", + "skeleton_infill_line_width": "0.62", "sparse_infill_line_width": "0.62", "sparse_infill_speed": ["100"], "support_line_width": "0.62", diff --git a/resources/profiles/X 4 Series/process/0.48mm Standard @XPlus4 0.8 nozzle.json b/resources/profiles/X 4 Series/process/0.48mm Standard @XPlus4 0.8 nozzle.json index fda4821..c37eccf 100644 --- a/resources/profiles/X 4 Series/process/0.48mm Standard @XPlus4 0.8 nozzle.json +++ b/resources/profiles/X 4 Series/process/0.48mm Standard @XPlus4 0.8 nozzle.json @@ -19,6 +19,8 @@ "outer_wall_line_width": "0.82", "overhang_3_4_speed": ["25"], "overhang_4_4_speed": ["5"], + "skin_infill_line_width": "0.82", + "skeleton_infill_line_width": "0.82", "sparse_infill_line_width": "0.82", "sparse_infill_speed": ["100"], "support_line_width": "0.82", diff --git a/resources/profiles/X 4 Series/process/0.56mm Standard @XPlus4 0.8 nozzle.json b/resources/profiles/X 4 Series/process/0.56mm Standard @XPlus4 0.8 nozzle.json index 9ee307b..0098997 100644 --- a/resources/profiles/X 4 Series/process/0.56mm Standard @XPlus4 0.8 nozzle.json +++ b/resources/profiles/X 4 Series/process/0.56mm Standard @XPlus4 0.8 nozzle.json @@ -19,6 +19,8 @@ "outer_wall_line_width": "0.82", "overhang_3_4_speed": ["25"], "overhang_4_4_speed": ["5"], + "skin_infill_line_width": "0.82", + "skeleton_infill_line_width": "0.82", "sparse_infill_line_width": "0.82", "sparse_infill_speed": ["100"], "support_line_width": "0.82", diff --git a/resources/profiles/X 4 Series/process/fdm_process_common.json b/resources/profiles/X 4 Series/process/fdm_process_common.json index fec40dd..df960df 100644 --- a/resources/profiles/X 4 Series/process/fdm_process_common.json +++ b/resources/profiles/X 4 Series/process/fdm_process_common.json @@ -4,6 +4,7 @@ "from": "system", "instantiation": "false", "adaptive_layer_height": "0", + "apply_top_surface_compensation": "0", "bottom_color_penetration_layers": "3", "bottom_shell_layers": "3", "bottom_shell_thickness": "0", @@ -21,6 +22,7 @@ "draft_shield": "disabled", "elefant_foot_compensation": "0", "enable_arc_fitting": "1", + "enable_height_slowdown": ["0"], "enable_overhang_speed": ["1"], "enable_prime_tower": "1", "enable_support": "0", @@ -28,6 +30,8 @@ "gap_infill_speed": ["50"], "infill_combination": "0", "infill_direction": "45", + "infill_lock_depth": "1.0", + "infill_rotate_step": "0", "infill_wall_overlap": "15%", "initial_layer_acceleration": ["500"], "initial_layer_infill_speed": ["105"], @@ -48,8 +52,14 @@ "ironing_type": "no ironing", "layer_height": "0.2", "line_width": "0.42", + "locked_skin_infill_pattern": "crosszag", + "locked_skeleton_infill_pattern": "zigzag", "max_travel_detour_distance": "0", + "machine_prepare_compensation_time": "260", "minimum_sparse_infill_area": "15", + "nozzle_flush_dataset": [ + "0" + ], "only_one_wall_top": "1", "outer_wall_acceleration": ["3000"], "outer_wall_line_width": "0.42", @@ -59,6 +69,7 @@ "overhang_3_4_speed": ["30"], "overhang_4_4_speed": ["10"], "overhang_totally_speed": ["10"], + "override_filament_scarf_seam_setting": "0", "prime_tower_width": "35", "print_sequence": "by layer", "print_settings_id": "", @@ -67,9 +78,32 @@ "reduce_infill_retraction": "1", "resolution": "0.012", "seam_position": "aligned", + "seam_placement_away_from_overhangs": "0", + "skeleton_infill_density": "15%", + "skin_infill_density": "15%", + "skin_infill_depth": "2.0", + "skin_infill_line_width": "0.45", "skirt_distance": "2", "skirt_height": "1", "skirt_loops": "0", + "slowdown_start_height": [ + "0" + ], + "slowdown_start_speed": [ + "1000" + ], + "slowdown_start_acc": [ + "100000" + ], + "slowdown_end_height": [ + "400" + ], + "slowdown_end_speed": [ + "1000" + ], + "slowdown_end_acc": [ + "100000" + ], "small_perimeter_speed": ["50%"], "small_perimeter_threshold": ["4"], "smooth_coefficient": "90", @@ -100,6 +134,11 @@ "support_threshold_angle": "30", "support_top_z_distance": "0.2", "support_type": "tree(auto)", + "seam_slope_type": "none", + "seam_slope_start_height": "10%", + "seam_slope_gap": "0", + "seam_slope_min_length": "10", + "symmetric_infill_y_axis": "0", "top_color_penetration_layers": "3", "top_shell_layers": "3", "top_shell_thickness": "0.8", @@ -119,5 +158,14 @@ "wipe_tower_no_sparse_layers": "0", "xy_contour_compensation": "0", "xy_hole_compensation": "0", + "z_direction_outwall_speed_continuous": "0", + "enable_circle_compensation": "0", + "circle_compensation_manual_offset": "0", + "infill_shift_step": "0.4", + "prime_tower_enable_framework": "0", + "prime_tower_lift_speed": "90", + "prime_tower_lift_height": "-1", + "prime_tower_max_speed": "90", + "prime_tower_flat_ironing":"0", "compatible_printers": [] } diff --git a/resources/shaders/110/gouraud.fs b/resources/shaders/110/gouraud.fs index 0ae3d7e..d368ab3 100644 --- a/resources/shaders/110/gouraud.fs +++ b/resources/shaders/110/gouraud.fs @@ -30,6 +30,10 @@ struct SlopeDetection }; uniform vec4 uniform_color; +uniform bool use_color_clip_plane; +uniform vec4 uniform_color_clip_plane_1; +uniform vec4 uniform_color_clip_plane_2; +uniform vec4 color_clip_plane; uniform SlopeDetection slope; //QDS: add outline_color @@ -60,6 +64,13 @@ void main() vec3 color = uniform_color.rgb; float alpha = uniform_color.a; + if (use_color_clip_plane){ + float color_clip_plane_dot = dot(world_pos, color_clip_plane); + vec4 full_color = (color_clip_plane_dot < EPSILON) ? uniform_color_clip_plane_1 : uniform_color_clip_plane_2; + color = full_color.rgb; + alpha = full_color.a; + } + if (slope.actived) { if(world_pos.z<0.1&&world_pos.z>-0.1) { diff --git a/resources/shaders/110/hotbed.fs b/resources/shaders/110/hotbed.fs index 6d8bb69..b008685 100644 --- a/resources/shaders/110/hotbed.fs +++ b/resources/shaders/110/hotbed.fs @@ -19,6 +19,7 @@ struct PrintVolumeDetection uniform vec4 uniform_color; uniform float emission_factor; uniform PrintVolumeDetection print_volume; +uniform vec4 full_print_volume; // x = diffuse, y = specular; varying vec2 intensity; varying vec4 world_pos; @@ -30,12 +31,18 @@ void main() vec3 pv_check_min = ZERO; vec3 pv_check_max = ZERO; if (print_volume.type == 0) {// rectangle - pv_check_min = world_pos.xyz - vec3(print_volume.xy_data.x, print_volume.xy_data.y, print_volume.z_data.x); - pv_check_max = world_pos.xyz - vec3(print_volume.xy_data.z, print_volume.xy_data.w, print_volume.z_data.y); - + pv_check_min = world_pos.xyz - vec3(full_print_volume.x, full_print_volume.y, print_volume.z_data.x); + pv_check_max = world_pos.xyz - vec3(full_print_volume.z, full_print_volume.w, print_volume.z_data.y); pv_check_min = pv_check_min * ONE_OVER_EPSILON; pv_check_max = pv_check_max * ONE_OVER_EPSILON; - color = (any(lessThan(pv_check_min, vec3(1.0))) || any(greaterThan(pv_check_max, vec3(1.0)))) ? mix(color, WHITE, 0.3333) : color; + if (all(greaterThan(pv_check_min, vec3(1.0))) && all(lessThan(pv_check_max, vec3(1.0)))) { + pv_check_min = world_pos.xyz - vec3(print_volume.xy_data.x, print_volume.xy_data.y, print_volume.z_data.x); + pv_check_max = world_pos.xyz - vec3(print_volume.xy_data.z, print_volume.xy_data.w, print_volume.z_data.y); + + pv_check_min = pv_check_min * ONE_OVER_EPSILON; + pv_check_max = pv_check_max * ONE_OVER_EPSILON; + color = (any(lessThan(pv_check_min, vec3(1.0))) || any(greaterThan(pv_check_max, vec3(1.0)))) ? mix(color, WHITE, 0.3333) : color; + } } else if (print_volume.type == 1) {// circle float delta_radius = print_volume.xy_data.z - distance(world_pos.xy, print_volume.xy_data.xy); diff --git a/resources/shaders/110/imgui.fs b/resources/shaders/110/imgui.fs index e711b69..50d73f0 100644 --- a/resources/shaders/110/imgui.fs +++ b/resources/shaders/110/imgui.fs @@ -1,11 +1,11 @@ #version 110 -uniform sampler2D Texture; +uniform sampler2D s_texture; varying vec2 Frag_UV; varying vec4 color; void main() { - gl_FragColor = color * texture2D(Texture, Frag_UV.st); + gl_FragColor = color * texture2D(s_texture, Frag_UV.st); } \ No newline at end of file diff --git a/resources/shaders/140/gouraud.fs b/resources/shaders/140/gouraud.fs index fbfb21f..b110a41 100644 --- a/resources/shaders/140/gouraud.fs +++ b/resources/shaders/140/gouraud.fs @@ -30,6 +30,10 @@ struct SlopeDetection }; uniform vec4 uniform_color; +uniform bool use_color_clip_plane; +uniform vec4 uniform_color_clip_plane_1; +uniform vec4 uniform_color_clip_plane_2; +uniform vec4 color_clip_plane; uniform SlopeDetection slope; //QDS: add outline_color @@ -62,6 +66,13 @@ void main() vec3 color = uniform_color.rgb; float alpha = uniform_color.a; + if (use_color_clip_plane){ + float color_clip_plane_dot = dot(world_pos, color_clip_plane); + vec4 full_color = (color_clip_plane_dot < EPSILON) ? uniform_color_clip_plane_1 : uniform_color_clip_plane_2; + color = full_color.rgb; + alpha = full_color.a; + } + if (slope.actived) { if(world_pos.z<0.1&&world_pos.z>-0.1) { diff --git a/resources/shaders/140/hotbed.fs b/resources/shaders/140/hotbed.fs index 4e932fe..cc010e0 100644 --- a/resources/shaders/140/hotbed.fs +++ b/resources/shaders/140/hotbed.fs @@ -19,6 +19,7 @@ struct PrintVolumeDetection uniform vec4 uniform_color; uniform float emission_factor; uniform PrintVolumeDetection print_volume; +uniform vec4 full_print_volume; // x = diffuse, y = specular; in vec2 intensity; in vec4 world_pos; @@ -32,12 +33,18 @@ void main() vec3 pv_check_min = ZERO; vec3 pv_check_max = ZERO; if (print_volume.type == 0) {// rectangle - pv_check_min = world_pos.xyz - vec3(print_volume.xy_data.x, print_volume.xy_data.y, print_volume.z_data.x); - pv_check_max = world_pos.xyz - vec3(print_volume.xy_data.z, print_volume.xy_data.w, print_volume.z_data.y); - + pv_check_min = world_pos.xyz - vec3(full_print_volume.x, full_print_volume.y, print_volume.z_data.x); + pv_check_max = world_pos.xyz - vec3(full_print_volume.z, full_print_volume.w, print_volume.z_data.y); pv_check_min = pv_check_min * ONE_OVER_EPSILON; pv_check_max = pv_check_max * ONE_OVER_EPSILON; - color = (any(lessThan(pv_check_min, vec3(1.0))) || any(greaterThan(pv_check_max, vec3(1.0)))) ? mix(color, WHITE, 0.3333) : color; + if (all(greaterThan(pv_check_min, vec3(1.0))) && all(lessThan(pv_check_max, vec3(1.0)))) { + pv_check_min = world_pos.xyz - vec3(print_volume.xy_data.x, print_volume.xy_data.y, print_volume.z_data.x); + pv_check_max = world_pos.xyz - vec3(print_volume.xy_data.z, print_volume.xy_data.w, print_volume.z_data.y); + + pv_check_min = pv_check_min * ONE_OVER_EPSILON; + pv_check_max = pv_check_max * ONE_OVER_EPSILON; + color = (any(lessThan(pv_check_min, vec3(1.0))) || any(greaterThan(pv_check_max, vec3(1.0)))) ? mix(color, WHITE, 0.3333) : color; + } } else if (print_volume.type == 1) {// circle float delta_radius = print_volume.xy_data.z - distance(world_pos.xy, print_volume.xy_data.xy); diff --git a/resources/shaders/140/imgui.fs b/resources/shaders/140/imgui.fs index 21641ac..0f435c3 100644 --- a/resources/shaders/140/imgui.fs +++ b/resources/shaders/140/imgui.fs @@ -1,6 +1,6 @@ #version 140 -uniform sampler2D Texture; +uniform sampler2D s_texture; in vec2 Frag_UV; in vec4 color; @@ -8,5 +8,5 @@ in vec4 color; out vec4 frag_color; void main() { - frag_color = color * texture(Texture, Frag_UV.st); + frag_color = color * texture(s_texture, Frag_UV.st); } \ No newline at end of file diff --git a/resources/web/data/text.js b/resources/web/data/text.js index f49e3b1..4290616 100644 --- a/resources/web/data/text.js +++ b/resources/web/data/text.js @@ -68,9 +68,9 @@ var LangText={ "t73": "Installation successful.", "t74": "Restart", "t75": "QIDI Network plug-in provides the following features:", - "t76": "QIDI Network plug-in not detected. Click ", - "t77": "here", - "t78": " to install it.", + "t76": "Please ", + "t77": "install", + "t78": " the network plugin before logging in", "t79": "Failed to install plug-in. ", "t80": "Try the following steps:", "t81": "1, Click ", @@ -105,7 +105,7 @@ var LangText={ "t111": "Create New", "t112": "Join the Program", "t113": "You may change your choice in preference anytime.", - "t114": "Home", + "t114": "Library", "t115": "Batch", "t116": "Retry", "t117": "Print History", @@ -191,9 +191,9 @@ var LangText={ "t73": "安装成功。", "t74": "重启", "t75": "QIDI网络插件提供以下功能：", - "t76": "没有发现QIDI网络插件，请", - "t77": "下载", - "t78": "并安装。", + "t76": "请在登陆前", + "t77": "安装", + "t78": "网络插件", "t79": "安装插件失败。", "t80": "请尝试如下步骤：", "t81": "1, 点击", @@ -228,7 +228,7 @@ var LangText={ "t111": "新建", "t112": "加入该计划", "t113": "您可以随时更改您的偏好。", - "t114": "首页", + "t114": "模型库", "t115": "批量处理", "t116": "重试", "t117": "打印历史", @@ -330,9 +330,9 @@ var LangText={ "t73": "インストールは成功しました", "t74": "再起動", "t75": "QIDI ネットワークプラグインは以下の機能を提供します：", - "t76": "QIDI ネットワークプラグインは検出されません。", - "t77": "こちら", - "t78": "をクリックし、インストールしてください。", + "t76": "ログイン前にネットワークプラグインをインストールしてください。", + "t77": "インストールしてください", + "t78": "", "t79": "インストールは失敗しました", "t80": "下記の方法もお試しください", "t81": "1. クリックして ", @@ -367,7 +367,7 @@ var LangText={ "t111": "新規作成", "t112": "この計画に参加する", "t113": "好みはいつでも変更できます.", - "t114": "トップページ", + "t114": "ライブラリ", "t115": "バッチ", "t116": "[再試行]", "t117": "印刷履歴", @@ -452,9 +452,9 @@ var LangText={ "t73": "Installazione completata.", "t74": "Riavvia", "t75": "Il plug-in di QIDI Network fornisce le seguenti funzionalità:", - "t76": "Plug-in di QIDI Network non rilevato. Fai clic ", - "t77": "qui", - "t78": " per installarlo.", + "t76": "Si prega di ", + "t77": "installare", + "t78": "il plugin di rete prima di accedere", "t79": "Installazione del plug-in non riuscita. ", "t80": "Prova i seguenti passaggi:", "t81": "1. Fai clic su ", @@ -489,7 +489,7 @@ var LangText={ "t111": "Crea Nuovo", "t112": "Partecipa al programma", "t113": "Puoi cambiare la tua scelta in qualsiasi momento.", - "t114": "Home", + "t114": "Libreria", "t115": "Lotto", "t116": "Riprova", "t117": "Storico di stampa", @@ -574,9 +574,9 @@ var LangText={ "t73": "Installation réussie.", "t74": "Redémarrer", "t75": "Le plug-in Réseau QIDI offre les fonctionnalités suivantes :", - "t76": "Plug-in Réseau QIDI non détecté. Cliquez ", - "t77": "ici", - "t78": " pour l'installer.", + "t76": "Veuillez ", + "t77": "installer", + "t78": " le plugin réseau avant de vous connecter", "t79": "Échec de l'installation du plug-in. ", "t80": "Suivez les étapes suivantes :", "t81": "1, Cliquez ", @@ -611,7 +611,7 @@ var LangText={ "t111": "Créer Nouveau", "t112": "Rejoignez le programme", "t113": "Vous pouvez modifier vos préférences à tout moment.", - "t114": "Accueil", + "t114": "Bibliothèque", "t115": "Un lot de", "t116": "Retenter", "t117": "Historique d'impression", @@ -696,9 +696,9 @@ var LangText={ "t73": "Installation erfolgreich.", "t74": "Neustart", "t75": "Das QIDI Network-Plug-In bietet folgende Funktionen:", - "t76": "QIDI Network-Plug-In nicht erkannt. Klicken Sie ", - "t77": "hier", - "t78": " um es zu installieren.", + "t76": "Bitte ", + "t77": "installieren", + "t78": " Sie das Netzwerk-Plugin, bevor Sie sich anmelden", "t79": "Installation des Plug-Ins fehlgeschlagen. ", "t80": "Versuchen Sie folgende Schritte:", "t81": "1, Klicken Sie ", @@ -733,7 +733,7 @@ var LangText={ "t111": "Neu erstellen", "t112": "Teilnahme am Programm", "t113": "Sie können Ihre Wahl jederzeit ändern.", - "t114": "Startseite", + "t114": "Bibliothek", "t115": "Charge", "t116": "Erneut versuchen", "t117": "Druckverlauf", @@ -818,9 +818,9 @@ var LangText={ "t73": "Telepítés sikeres.", "t74": "Újraindítás", "t75": "A QIDI Network plug-in a következő funkciókat biztosítja:", - "t76": "A QIDI Network plug-in nem található. Kattintson ", - "t77": "ide", - "t78": " a telepítéshez.", + "t76": "Jelentkezés előtt ", + "t77": "telepítse", + "t78": " a hálózati bővítményt", "t79": "Nem sikerült telepíteni a plug-int. ", "t80": "Próbálja meg az alábbi lépéseket:", "t81": "1, Kattintson ", @@ -855,7 +855,7 @@ var LangText={ "t111": "Új Létrehozása", "t112": "Csatlakozás a programhoz", "t113": "Bármikor megváltoztathatja a preferenciáját.", - "t114": "honlap", + "t114": "Könyvtár", "t115": "Tétel", "t116": "Újrapróbálkozás", "t117": "Nyomtatási előzmények", @@ -940,9 +940,9 @@ var LangText={ "t73": "Instalación exitosa.", "t74": "Reiniciar", "t75": "El complemento de red de QIDI proporciona las siguientes características:", - "t76": "No se detectó el complemento de red de QIDI. Haga clic ", - "t77": "aquí", - "t78": " para instalarlo.", + "t76": "Por favor,", + "t77": "instala", + "t78": " el complemento de red antes de iniciar sesión", "t79": "Error al instalar el complemento. ", "t80": "Intente los siguientes pasos:", "t81": "1, Haga clic en ", @@ -977,7 +977,7 @@ var LangText={ "t111": "Crea Nuovo", "t112": "Unirse al programa", "t113": "Puede cambiar sus preferencias en cualquier momento.", - "t114": "Página de inicio", + "t114": "Biblioteca", "t115": "Un lote", "t116": "Reintentar", "t117": "Historial de impresión", @@ -1062,9 +1062,9 @@ var LangText={ "t73": "Installation lyckad.", "t74": "Starta om", "t75": "QIDI Network plug-in tillhandahåller följande funktioner:", - "t76": "QIDI Network plug-in upptäcktes inte. Klicka ", - "t77": "här", - "t78": "för att installera det.", + "t76": "", + "t77": "Installera", + "t78": "nätverksinsticksprogrammet innan du loggar in", "t79": "Misslyckades med att installera tillägget. ", "t80": "Försök följande steg:", "t81": "1, Klicka ", @@ -1099,7 +1099,7 @@ var LangText={ "t111": "Skapa ny", "t112": "Gå med i programmet", "t113": "Du kan ändra ditt val när som helst.", - "t114": "startsida", + "t114": "Bibliotek", "t115": "Batch", "t116": "Försök igen", "t117": "Utskriftshistorik", @@ -1184,9 +1184,9 @@ var LangText={ "t73": "Instalace úspěšná.", "t74": "Restart", "t75": "Zásuvný modul QIDI Network poskytuje následující funkce:", - "t76": "Zásuvný modul QIDI Network nenalezen. Klikněte ", - "t77": "sem", - "t78": " pro instalaci.", + "t76": "Před přihlášením ", + "t77": "nainstalujte", + "t78": " síťový plugin", "t79": "Instalace zásuvného modulu selhala. ", "t80": "Zkuste následující kroky:", "t81": "1, Klikněte ", @@ -1221,7 +1221,7 @@ var LangText={ "t111": "Nové", "t112": "Připojte se k programu", "t113": "Své preference můžete kdykoliv změnit.", - "t114": "domovská stránka", + "t114": "Knihovna", "t115": "Šarže", "t116": "Zkuste to znovu", "t117": "Historie tisku", @@ -1295,10 +1295,10 @@ var LangText={ "t62": "Andere", "t63": "Na het wijzigen van de regio wordt uw account uitgelogd. Log later opnieuw in.", "t64": "QIDI Network-plug-in", - "t65": "Afdruktaak verzenden via WLAN", + "t65": "Afdruktaak verzenden via WLAN of cloud service", "t66": "Volledige externe bediening", - "t67": "Liveview-streaming", - "t68": "Gebruikersgegevenssynchronisatie", + "t67": "Liveview-streaming en printerstatusmonitoring", + "t68": "Cloudsynchronisatie voor slicingconfiguratie", "t69": "QIDI Network-plug-in installeren", "t70": "", "t71": "Downloaden", @@ -1306,9 +1306,9 @@ var LangText={ "t73": "Installatie succesvol.", "t74": "Herstart", "t75": "QIDI Network-plug-in biedt de volgende functies:", - "t76": "QIDI Network-plug-in niet gedetecteerd. Klik ", - "t77": "hier", - "t78": " om deze te installeren.", + "t76": "", + "t77": "Installeer", + "t78": " de netwerkplug-in voordat u inlogt", "t79": "Installatie van de plug-in mislukt. ", "t80": "Probeer de volgende stappen:", "t81": "1, Klik ", @@ -1343,7 +1343,7 @@ var LangText={ "t111": "Nieuw maken", "t112": "Deelnemen aan het programma", "t113": "U kunt uw keuze op elk gewenst moment wijzigen.", - "t114": "startpagina", + "t114": "Bibliotheek", "t115": "Batch", "t116": "Probeer het opnieuw", "t117": "Afdrukhistoriek", @@ -1428,9 +1428,9 @@ var LangText={ "t73": "Встановлення виконано успішно.", "t74": "Перезавантаження", "t75": "Мережевий плагін QIDI надає наступні можливості:", - "t76": "Мережевий плагін QIDI не виявлено. Натисніть ", - "t77": "тут", - "t78": " щоб встановити його.", + "t76": "", + "t77": "Встановіть", + "t78": " мережевий плагін перед входом", "t79": "Помилка встановлення плагіна. ", "t80": "Спробуйте виконати наступні дії:", "t81": "1, Натисніть ", @@ -1465,7 +1465,7 @@ var LangText={ "t111": "Створити новий", "t112": "Приєднуйтеся до програми", "t113": "Ви можете змінити свої переваги в будь-який час.", - "t114": "Головна сторінка", + "t114": "Бібліотека", "t115": "Одна партія", "t116": "Спробувати знову", "t117": "Історія друку", @@ -1550,9 +1550,9 @@ var LangText={ "t73": "Установка выполнена успешно.", "t74": "Перезагрузка", "t75": "Сетевой плагин QIDI предоставляет следующие возможности:", - "t76": "Сетевой плагин QIDI не обнаружен. Нажмите ", - "t77": "здесь", - "t78": " чтобы установить его.", + "t76": "Пожалуйста, ", + "t77": "установите", + "t78": " сетевой плагин перед входом в систему", "t79": "Ошибка установки плагина. ", "t80": "Попробуйте выполнить следующие действия:", "t81": "1, Нажмите ", @@ -1587,7 +1587,7 @@ var LangText={ "t111": "Создать новый", "t112": "Присоединяйтесь к программе", "t113": "Вы можете изменить свои предпочтения в любое время.", - "t114": "Главная страница", + "t114": "Библиотека", "t115": "Одна партия", "t116": "Повторить попытку", "t117": "История печати", @@ -1672,9 +1672,9 @@ var LangText={ "t73": "Kurulum başarılı oldu.", "t74": "Tekrar başlat", "t75": "QIDI Network eklentisi aşağıdaki özellikleri sağlar:", - "t76": "QIDI Network eklentisi algılanmadı. Tıklayın.", - "t77": "here", - "t78": " burayı tıklayın.", + "t76": "Lütfen giriş yapmadan önce ağ eklentisini ", + "t77": "yükleyin", + "t78": "", "t79": "Eklenti yüklenemedi. ", "t80": "Aşağıdaki adımları deneyin:", "t81": "1, Eklenti ", @@ -1709,7 +1709,7 @@ var LangText={ "t111": "Yeni Oluştur", "t112": "Programa Katıl", "t113": "ercihlerinizde istediğiniz zaman seçiminizi değiştirebilirsiniz.", - "t114": "Ana Sayfa", + "t114": "Kitaplık", "t115": "Toplu", "t116": "Yeniden Dene", "t117": "Yazdırma geçmişi", @@ -1794,9 +1794,9 @@ var LangText={ "t73": "Instalação concluida.", "t74": "Reiniciar", "t75": "QIDI Network plug-in fornece os seguintes recursos:", - "t76": "QIDI Network plug-in não detectado. Clique ", - "t77": "Aqui", - "t78": " para instalar.", + "t76": "", + "t77": "Instale", + "t78": " o plugin de rede antes de fazer login", "t79": "Instalação do plug-in falhou. ", "t80": "Tente os seguintes passos:", "t81": "1, Clique ", @@ -1831,7 +1831,7 @@ var LangText={ "t111": "Criar Novo", "t112": "Junte-se ao Programa", "t113": "Você pode alterar sua escolha nas Preferências a qualquer momento", - "t114": "Inicio", + "t114": "Biblioteca", "t115": "Lote", "t116": "Retentar", "t117": "Histórico de impressão", @@ -1916,9 +1916,9 @@ var LangText={ "t73": "설치 성공.", "t74": "재시작", "t75": "QIDI Network 플러그인은 다음 기능을 제공합니다:", - "t76": "QIDI Network 플러그인이 감지되지 않았습니다. 클릭", - "t77": "여기", - "t78": "를 클릭하여 설치하십시오.", + "t76": "로그인하기 전에 네트워크 플러그인을 ", + "t77": "설치해 주세요", + "t78": "", "t79": "플러그인 설치에 실패했습니다. ", "t80": "다음 단계를 시도해 보십시오:", "t81": "1, 클릭", @@ -1953,7 +1953,7 @@ var LangText={ "t111": "새로 만들기", "t112": "프로그램 참여", "t113": "언제든지 환경 설정에서 선택을 변경할 수 있습니다.", - "t114": "홈", + "t114": "라이브러리", "t115": "일괄 처리", "t116": "재시도", "t117": "인쇄 기록", @@ -2038,9 +2038,9 @@ var LangText={ "t73": "Instalacja zakończona sukcesem.", "t74": "Uruchom ponownie", "t75": "Wtyczka QIDI Network zapewnia następujące funkcje:", - "t76": "Nie wykryto wtyczki QIDI Network. Kliknij", - "t77": "tutaj", - "t78": "aby ją zainstalować.", + "t76": "", + "t77": "Zainstaluj", + "t78": " wtyczkę sieciową przed zalogowaniem się", "t79": "Nie udało się zainstalować wtyczki. ", "t80": "Wypróbuj następujące kroki:", "t81": "1, Kliknij", @@ -2075,7 +2075,7 @@ var LangText={ "t111": "Utwórz nowy", "t112": "Dołącz do programu", "t113": "Opcja można zmienić w preferencjach w dowolnym momencie.", - "t114": "Strona główna", + "t114": "Biblioteka", "t115": "Wartość zbiorcza", "t116": "Ponów", "t117": "Historia druku", diff --git a/resources/web/homepage3/css/common.css b/resources/web/homepage3/css/common.css index 42389c9..31476a8 100644 --- a/resources/web/homepage3/css/common.css +++ b/resources/web/homepage3/css/common.css @@ -34,6 +34,20 @@ html, body { color: #ACACAC; } +.DropdownBG +{ + background: white; +} + +.DropdownHeaderBG +{ + background-color: #F7F7F7; +} + +.DropdownFooter:hover { + background-color: #f5f5f5; +} + /*-------按钮------*/ .Btn_White { diff --git a/resources/web/homepage3/css/dark.css b/resources/web/homepage3/css/dark.css index be247c5..de8c0b4 100644 --- a/resources/web/homepage3/css/dark.css +++ b/resources/web/homepage3/css/dark.css @@ -19,6 +19,19 @@ html,body color:#F8F8F8; } +.DropdownBG +{ + background: #3E3E45; +} + +.DropdownHeaderBG +{ + background-color: #343436; +} + +.DropdownFooter:hover { + background-color: #4a4a4d; +} /*---字体----*/ .ZScrol::-webkit-scrollbar-thumb {/*滚动条里面小方块*/ diff --git a/resources/web/homepage3/css/left.css b/resources/web/homepage3/css/left.css index 32c18bf..29e59d4 100644 --- a/resources/web/homepage3/css/left.css +++ b/resources/web/homepage3/css/left.css @@ -49,6 +49,7 @@ html, body { font-size:12px; color: #1200FF; cursor: pointer; + text-decoration: underline; } .LinkBtn:hover @@ -73,13 +74,13 @@ body { border-right-width: 1px; border-right-style: solid; - width: 100%; + width: calc(100% - 1px); height: 100%; } #LoginArea { - height: 180px; + height: 90px; display: flex; flex-direction: column; align-items: center; @@ -87,6 +88,8 @@ body flex-wrap: nowrap; position: relative; width:100%; + border-bottom-width: 1px; + border-bottom-style: solid; } @@ -100,22 +103,36 @@ body cursor:pointer; } +#LoginBtn +{ + display: flex; + align-items: center; + width: 120px; + word-wrap: break-word; + line-height: 1.2; + flex-wrap: wrap; + white-space: normal; +} + #Login1:hover #LoginBtn { - font-size:17px; + transform: scale(1.05); } #NoPluginTip { - position: absolute; - left: 0px; - bottom: 0px; - right: 0px; - display: none; + margin-top: 5px; + display: flex; flex-direction: column; justify-content: flex-end; - padding: 5px; + padding-top: 0px; + padding-bottom: 0px; + padding-left: 5px; + padding-right: 5px; + border-radius: 4px; + border: 1px solid var(--remind, #FF6F00); + background: rgba(255, 111, 0, 0.15); } @@ -138,26 +155,38 @@ body #Login2 { display: none; - flex-direction: column; align-items: center; text-align: center; - width: 100%; + justify-content: center; + width: 95%; + cursor: pointer; } #UserAvatarIcon { - height: 85px; - border-radius: 50%; - overflow: hidden; + height: 36px; } #UserName { - white-space: nowrap; + white-space: normal; text-overflow: ellipsis; - text-align: center; + text-align: left; overflow: hidden; - width: 80%; + margin-left: 12px; + word-wrap: break-word; + line-height: 1.2; +} + +.PullBtn +{ + margin-left: 10px; + width: 16px; + height: 16px; + background-image: url('../img/left_pull_btn.svg'); + background-size: cover; + background-position: center center; + background-repeat: no-repeat; } #LogoutBtn @@ -183,14 +212,17 @@ body /*------------------*/ #BtnArea { - + height: calc(100% - 91px); + display: flex; + flex-direction: column; + justify-content: space-between; } .BtnItem { - padding-left:30px; - padding-right: 14px; + padding-left: 20px; + padding-right: 20px; height:50px; line-height: 50px; display: flex; @@ -203,6 +235,13 @@ body text-overflow: ellipsis; } +.TopDivider +{ + border-top-width: 1px; + border-top-style: solid; +} + + .BtnItem[menu="online"] { display: none; @@ -236,6 +275,12 @@ body justify-content: center; } +.BtnIcon-Right +{ + display: block; + margin-left: auto; +} + .BtnText { overflow: hidden; @@ -245,10 +290,16 @@ body .LeftIcon { - width:24px; + width: 24px; height: 24px; } +.RightIcon +{ + width: 15px; + height: 15px; +} + .BtnNewIcon { height: 12px; @@ -263,6 +314,74 @@ body display: none; } +/*dropdown*/ +#DropdownWrapper { + visibility: hidden; + width: 95%; + border-radius: 8px; + overflow: hidden; + box-shadow: 0 4px 10px rgba(0, 0, 0, 0.1); + position: absolute; + z-index: 1; + top: 70%; + left: 3px; +} +.dropdown-header { + display: flex; + align-items: center; + padding: 12px; +} +.avatar { + width: 38px; + height: 38px; + min-width: 38px; + margin-right: 16px; + background-image: url('../img/left_home_account.svg'); + background-size: cover; + background-position: center center; + background-repeat: no-repeat; +} +.user-details { + display: flex; + flex-direction: column; + justify-content: center; +} +.UserName { + font-size: 15px; + font-weight: bold; + text-align: left; +} +.UserEmail { + font-size: 10px; + white-space: normal; + word-break: break-word; + overflow: hidden; + max-width: 92%; + text-align: left; + line-height: 1.4; +} +.DropdownFooter { + padding: 10px; + display: flex; + align-items: center; + cursor: pointer; + transition: background 0.2s; +} + +.LogoutIcon { + width: 15px; + height: 15px; + background-image: url('../img/left_logout_icon.svg'); + background-size: cover; + background-position: center center; + background-repeat: no-repeat; + margin-right: 8px; +} +.LogoutBtn +{ + font-size: 13px; +} + /*-----Hide Button-----*/ #HideBtn { diff --git a/resources/web/homepage3/css/left_mini.css b/resources/web/homepage3/css/left_mini.css index 9e6292f..cc4f62d 100644 --- a/resources/web/homepage3/css/left_mini.css +++ b/resources/web/homepage3/css/left_mini.css @@ -59,6 +59,11 @@ display: none!important; } +.BtnIcon-Right +{ + display: none!important; +} + /*-----Hide Button-----*/ #HideBtn { @@ -66,4 +71,8 @@ border-radius: 0px 4px 4px 0px; border-left: 0px solid rgba(238, 238, 238, 1); border-right: 1px solid rgba(238, 238, 238, 1); -} \ No newline at end of file +} + +.auto-hide { + display: none!important; + } diff --git a/resources/web/homepage3/img/i2.png b/resources/web/homepage3/img/i2.png deleted file mode 100644 index 55a2e74fb97c5db6da86b0ed06fc989148e6b8e0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6133 zcmai2c|26#`#-Z_>=apIjD1N6jWsh!A=#3p#Mo1mJpRGf2iR zOV(_mP1a;=<2(KP`{#FGuXE42&+~pgujh5|bKmFvocosM=Q-Jg*#H2XCdOy20e~=; z5P)E2OpXE1JsA_LpRq$A0PIKq4G4JrMDQOZ(E7XqsOl5>!FYgs>0i_b;MGI+eHSJG z1QJZn>f3}uet*IE*oApjU=Jlkt!tV^6t0F zqU{*l+oM*v@{_MBmN_wB_YxsK!d5SKkv8`tGmlm>B_@b8k+jvTxY>;VLcn?uX-1 zt83e@9|Eg02*7mJ$tmv}(q4EsjJ^of*hrr_%9aMlM~1C$H+0VgM!31T_2NPEG!y3-8ZLZ7r%JzA`{G@Q1YsTA>ud` z&+@|dCLy9NX9`iZu6!vWt4!K`e={_B8KsK=$y1GYlo#vL#b}c@^xEmnWFduRKb0{V zIT0wH=@RAYISb4gcV-tXup~|AiOt5voLh~7!>S%uiXf3I^tCo_U*Z%Bm|ZWZBU||M zZLqaqW=`fg{TG8Jal`Sa>gQy?+_DpnOdD9+OkclwGcxi(i=cr3lBiy8!{|^vc9sQ7 zksVlTi}|<06JnjY5b#?@VxULRSvV@KtHO6$XX&*0MrXti6i+>`FOajk>?~Zn+?OW( zW@DgxR5WU)di2+-a^+yyijf-| zhV-n~o3z1tHSKZ7n&`jF;~L^VEg8kV`yqWkPFD(|nc_&5NF=gKoX1SI9N-2Iy!iSw zF<(dZwsDh%>VHkL3;f#HieiL8oHwZB)Nhd$J3A;n$KaDJrD+d3Iiyb5 zmxz?2td0x52!P;AYZvBHoiLeC)5kx*8@aCj+3)(&LcJ%d;pS@97Z;MfWV(QqNmjxS0jks3a|EOjUEx zje)u_L4m;T!t$By$?e>YXLH{u!>qS92MSE+uoi_;CZy#DQ&A95&hQAJItp9#`j1Q{ z1RGm+0o2#XC{3xz#*2AW`xNJk>ie#Xya?AS_H-q%pwccYJ6h%A<5S5CH?$Src!|~9 zj@c)1+Sa-16x7;4D0g0Q51pM;8+vc8Xhyv|mTSyvjC-VO8IAyUrb7ozcEM2FN&kE0h zWPLn*FlBI$-1;B?{fZ~7@N7s{?V)S{)n{TyM}sa(G)?uH{W((6-;k;-^mTN>+(V5p z3#Cx9W*jDzSW(KdVUJTCm%+g^Rx@dgn( zG&etMs3ny?MLIE2l^G0kaDh;sENl{|CKA3Gs7+#mE)c5=0i-~^kpSAa_8W4Fzb1}1=PGj%tk zrYbhamksv1UAS!8i7Ac2DL7iZGm^EdzdF~yJU2h@Y9LLz07yGg0e)(VnBi{wY4&F0 zGbRaL?qcvIFHcX?Q+#VkAhmVp)ffv)7#69Cpj!FYQJt>D7UH)7u4LcGV{DK;?36>v zR%@Or2h)3I5EvU_aI9!PIy5vi4g`EK($B7X+a!jf72@jvstiMRD5Z~0!Hnj@@$R{A zPnQ&t%`Z;=O>mo)^RxLNQu>*eaHu5#+efan%DdMVKyt zIxqqH(u=A;0ima0Sn-~<5t+Nb)&!q8@beT$c=U59iv#w`0usWAcWv|Gv{-p7nq4m7 zAzm9~?ftMB*fY$ir$Q4Hn9HGfd3teC3+F zZpW3s?tv~P$}yXZ0-uEF?+1llJw)_Yr@j#%?6eTRxAoowpzuJ=F^B7x_^RtHgB739 zo;mH`6^*tGUK$`h2y&0cR>?A7$#He%Zr8A3(BlJ<#=Jt4@|tM7X|H0i4gy15jqTn8}4#jsR^y={U}-(momhs^SSS? z{unBqAZubX+>5?Oo}r8ZN_%{I&;Skcy`Hm7&1L2n#GDf>En|G)T?lYJBm^xf-7Qah z#W12j#l-`ZJ4jV2yy5{M&?jj$Vm2XH$h? z!J7UH+XzF`=>7Hc26?nDph9O6q};;>=Ui78o@OIR{!<$U5FQF|jsdE!G)7lQ2xxj( zJ=E#TJ5ynP2Pjlt)MgD+RR#7vAm}9ofqRaYzkbs{P4fkFK`)qqgZxiiN$f&U(rXYe z1n?=-DF)&~;LzeS>D#1Lb>z5#%%`CC8wtBg$)kjRCQ*@M09pJ3p+I$a;AnC9^P zcae#U@lq;4SS67I;9>@1seLeD3xPiP=oaR?XH328y}}H~C-{qkfjwAy{1Cv)WAOnk zJOFjR@I`vA^m8c(&A}UQ9`iwzu3T6eKUKHh%EtrBZ|2>ls3m~y@{U!JwFwc9yg-zF zA$DhKymT%IF?+K?f+AJq@2?U{CCt{fx3|aO6h}`3IFNe+CuV173pB5eR6zM4u+d*z z6L4X6hSc3=H9xHm#&mM=3YMtTAmurg_M7Lqh^VME-!b3VWodR1Vc>)Q)6>@{0rTtWx$OnNOd=86Wu9Kj zMZ+x*xWkZWalb03>KXB2Xvwiz>C@#Lc(rVF*sLyC(^X8sBmHbYFFDN~YxzKPnBww| zc-K1tcb4_dJq9L#<+WY4cdgb5e!S4+8Q9;3%H!&O(j1X64b#-)Seo9YZ9V>J2!nan!1~1dO zh?$ap(U?+S=I{&Jtolkcap$jfZ)_`q@4{}I%8oYlUW&Q!y0^o(f3Kt)F-NPr%Uz z;s=`|wyg(mgDyFiqfB5@8!%9keNS$u9VtDWsEkk;n&K!zGUFUn&MHXf_Wk3?Mch2V z1?q5~R|}Sc%SoCadVJ3z86ZavoA1N$;{tdWK!N+%9{NXgN*@R?D7Qw!L`PJv2113R z*t%sCqaPR9RF4Mg%=nj2612+C$Vw}+5$)}j=$%{WXJt_AvrnYqvwOY8o>$-ngY`8L z#-?Ec(PKCyavx7J5`TLCC<-$`jir$@Ff-vdwG)C)s#n}{VgrC zkaPS9 z!P0Yzbou-e|Cc@XUjUcG#AC~1(CLltyf^UAfbyvU_hT4+Ju4)g z{hNF1TEeeKF|}Tk-hgx?s&4WiNpZ<&(O4>(REGfX1JQ6EW#{JqqIWhHF+1J2P3}Ki zj9!a=*83xUJK_^?{iY84&ggu1Gyd2~B=*hC&Dk0Gl0f{uGzYwezcL-a+~Z~oD40@1 ze6wA((;KZM3#t-3r4r!1oK!&zzeOjsQX%inmEWgAIH0tz(l8z+HX_lBX^>q&Y1vN( zU#1T_-g|)7%H%F8QL%hBoWc$T-xzAN#gL%muEmFA*R5I00u=e%hIlsZo*O1{9dy zV*;-jpKH*_$`XYDX4NklA?%Fw33Gt5z$OokN=PKW)+@NkmDOuVeti5YWR_1K4z%Pm z?oxsS_~2u@UQlICL?sV+U~`=lNAeMV7rynAt8{fRu<_jqm8O8jE+HjNPxz-)@A=!! zJ4>_&Y{Z9fE100vuYIkg%*Xg{cEg&swl>t|9)G$S9Zapy7G1>WD&<`&z=%LB(h4UE6I&PDMP)4}Bl@EH(Pc+n~(x#hD@;>O%1&X;q ztKv>N(b6Ew!;{zQ+-y>*Ki$%C)kH%>a=i@&iAdjiXgzFC4j)V#Udv6 zC+-*f*#|w-(B7|co&)dCsaP+kXtr0t*MRYU>&#kO`wY8$AS!0IU}QOvz8*W zSd_j?eoc&qWBm<*Ylh!7Lg-F?o5~&zRqB5YB52}LUz``6qB)!BK~FhAq^JEr5e3@9 zvsdzH0DU2CW&`ufug#~ww>Q`a8Lq`nIE>ibH?2>(pd6L#eBb*!E7L$tK69zg_DKRF|ez^hbZUboDqlPEl@mgcFq|X9M8*xAQEC% zd7%_R7y(th@i3u757c}8FF5cAi%pw9zDgb>WHM^4vf1Qe2{ zuO&Opd>qr`Kma64jTT?&I<;gMdrk}q2mNO2Ymdi;kI!p|k4nACgjxOdIR0mMclRn0 zCk_^R+*!Ug_!k8o;jmWF7|$nt>Xa$@GRBRSKMuzOY9-O9`INw;zcn#D8gm@zkcKM} z0+;s!3;`mYLzKS1*}v&&mj{Qj@@(Xh$iWC-ZIe07vTl0xN9R?^jA|J;J~b75`WxK)XA0>c)Z(GXqp8*{>i<=!n#K_%nMDn6{6&41la#M1W%vDKs + + + diff --git a/resources/web/homepage3/img/left_home_account.svg b/resources/web/homepage3/img/left_home_account.svg new file mode 100644 index 0000000..8e220e2 --- /dev/null +++ b/resources/web/homepage3/img/left_home_account.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/resources/web/homepage3/img/left_library.svg b/resources/web/homepage3/img/left_library.svg new file mode 100644 index 0000000..e40ce51 --- /dev/null +++ b/resources/web/homepage3/img/left_library.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/resources/web/homepage3/img/left_link.svg b/resources/web/homepage3/img/left_link.svg new file mode 100644 index 0000000..5cf7e26 --- /dev/null +++ b/resources/web/homepage3/img/left_link.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/web/homepage3/img/left_logout_icon.svg b/resources/web/homepage3/img/left_logout_icon.svg new file mode 100644 index 0000000..5a5f8a8 --- /dev/null +++ b/resources/web/homepage3/img/left_logout_icon.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/web/homepage3/img/left_manual.svg b/resources/web/homepage3/img/left_manual.svg index 03e90cc..96621eb 100644 --- a/resources/web/homepage3/img/left_manual.svg +++ b/resources/web/homepage3/img/left_manual.svg @@ -1,5 +1,5 @@ - - - - + + + + diff --git a/resources/web/homepage3/img/left_ml.svg b/resources/web/homepage3/img/left_ml.svg index 750ef49..4fc92b1 100644 --- a/resources/web/homepage3/img/left_ml.svg +++ b/resources/web/homepage3/img/left_ml.svg @@ -1,5 +1,5 @@ - - - - + + + + diff --git a/resources/web/homepage3/img/left_ms.svg b/resources/web/homepage3/img/left_ms.svg index 299e48a..b99254d 100644 --- a/resources/web/homepage3/img/left_ms.svg +++ b/resources/web/homepage3/img/left_ms.svg @@ -1,21 +1,3 @@ - - - - - - - - - - - - - - - - - - - - + + diff --git a/resources/web/homepage3/img/left_online.svg b/resources/web/homepage3/img/left_online.svg index 54b0d10..ab9bf98 100644 --- a/resources/web/homepage3/img/left_online.svg +++ b/resources/web/homepage3/img/left_online.svg @@ -1,3 +1,3 @@ - - + + diff --git a/resources/web/homepage3/img/left_ph.svg b/resources/web/homepage3/img/left_ph.svg index a7dc8c6..09b13db 100644 --- a/resources/web/homepage3/img/left_ph.svg +++ b/resources/web/homepage3/img/left_ph.svg @@ -1,8 +1,8 @@ - - - - - - - + + + + + + + diff --git a/resources/web/homepage3/img/left_pull_btn.svg b/resources/web/homepage3/img/left_pull_btn.svg new file mode 100644 index 0000000..59d86e3 --- /dev/null +++ b/resources/web/homepage3/img/left_pull_btn.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/web/homepage3/js/left.js b/resources/web/homepage3/js/left.js index b87d2d0..6e23ebb 100644 --- a/resources/web/homepage3/js/left.js +++ b/resources/web/homepage3/js/left.js @@ -2,6 +2,7 @@ var m_HotModelList=null; var m_HasNetworkPlugin=true; +var m_GetPrintHistoryStatus=false; function OnInit() { @@ -10,25 +11,36 @@ function OnInit() SendMsg_GetLoginInfo(); GotoMenu( 'home' ); + $("#Login2").hover(function() { + $("#DropdownWrapper").css("visibility", "visible"); + }, function() { + $("#DropdownWrapper").css("visibility", "hidden"); + }); + OnUpdatePluginInstalltip(); } function HandleStudio( pVal ) { let strCmd = pVal['command']; - if(strCmd=='studio_userlogin') { + let lastLoginInfo = pVal; + SetLoginInfo(pVal['data']['avatar'],pVal['data']['name']); + if (!m_GetPrintHistoryStatus) { + SendMsg_GetPrintHistory(); + } SetLoginInfo(pVal['data']['avatar'],pVal['data']['name']); } else if(strCmd=='studio_useroffline') { + m_GetPrintHistoryStatus=false; SetUserOffline(); } else if( strCmd=="network_plugin_installtip" ) { let nShow=pVal["show"]*1; - + if(nShow==1) { $("#NoPluginTip").show(); @@ -41,9 +53,9 @@ function HandleStudio( pVal ) $("#NoPluginTip").hide(); m_HasNetworkPlugin=true; } - } + } else if(strCmd=='homepage_leftmenu_clicked') - { + { let NewMenu=pVal['menu']; //alert('LeftMenu Clicked:'+strMenu ); @@ -62,7 +74,11 @@ function HandleStudio( pVal ) let nShow=pVal['show']; ShowMenuBtn(NewMenu,nShow); - } + } + else if(strCmd=='printhistory_task_show') + { + m_GetPrintHistoryStatus=true; + } } var NowMenu=''; @@ -132,30 +148,34 @@ function ShowMenuBtn( MenuName,nShow) } -function SetLoginInfo( strAvatar, strName ) +function SetLoginInfo( strAvatar, strName ) { $("#Login1").hide(); $("#UserName").text(strName); - - let OriginAvatar=$("#Login2 #UserAvatarIcon").prop("src"); - if(strAvatar!=OriginAvatar && strAvatar.length != 0) + $("#DropdownUserName").text(strName); + + let OriginAvatar=$("#UserAvatarIcon").prop("src"); + if(strAvatar!=OriginAvatar) { + $("#UserAvatarIcon").prop("src",strAvatar); + $("#DropdownAvatar").css("background-image", "url('"+strAvatar+"')"); + }else { - $("#Login2 #UserAvatarIcon").prop("src",strAvatar); + //alert('Avatar is Same'); } - else - $("#Login2 #UserAvatarIcon").prop("src", "../image/userdark.png"); - + $("#Login2").show(); $("#Login2").css("display","flex"); } function SetUserOffline() { - $("#UserAvatarIcon").prop("src","../image/logo2.png"); + $("#UserAvatarIcon").prop("src","img/left_home_account.svg"); + $("#DropdownAvatar").css("background-image","../img/left_home_account.svg"); $("#UserName").text(''); - $("#Login2").hide(); - + $("#DropdownUserName").text(''); + $("#Login2").hide(); + $("#Login1").show(); $("#Login1").css("display","flex"); } @@ -199,8 +219,17 @@ function OnLogOut() var tSend={}; tSend['sequence_id']=Math.round(new Date() / 1000); tSend['command']="homepage_logout"; - - SendWXMessage( JSON.stringify(tSend) ); + + SendWXMessage( JSON.stringify(tSend) ); +} + +function OnUpdatePluginInstalltip() +{ + var tSend={}; + tSend['sequence_id']=Math.round(new Date() / 1000); + tSend['command']="update_plugin_installtip"; + + SendWXMessage( JSON.stringify(tSend) ); } function SendMsg_CheckNewTag() @@ -217,8 +246,17 @@ function BeginDownloadNetworkPlugin() var tSend={}; tSend['sequence_id']=Math.round(new Date() / 1000); tSend['command']="begin_network_plugin_download"; - - SendWXMessage( JSON.stringify(tSend) ); + + SendWXMessage( JSON.stringify(tSend) ); +} + +function SendMsg_GetPrintHistory() +{ + var tSend={}; + tSend['sequence_id']=Math.round(new Date() / 1000); + tSend['command']="homepage_printhistory_get"; + + SendWXMessage( JSON.stringify(tSend) ); } var WidthBoundary=168; diff --git a/resources/web/homepage3/left.html b/resources/web/homepage3/left.html index c969a23..09d9d64 100644 --- a/resources/web/homepage3/left.html +++ b/resources/web/homepage3/left.html @@ -22,55 +22,79 @@
-
+
login/register
- +
-
-
log out
-
+
+
+ +
+ +
-
-
-
Home
-
-
-
-
Recent
-
-
-
-
Online Models
-
New
-
-
-
-
MakerLab
-
New
+
+
+
+
Library
+
+
+
+
Recent
+
+
+
+
Online Models
+
New
+
+
+
+
MakerLab
+
New
+
+ +
- -
-
-
Print History
-
-
-
-
User Manual
-
+ +
+
+
+
Print History
+
+
+
+
User Manual
+
+
+