Commit graph

128 commits

Author SHA1 Message Date
tao wang
6f6c82a0b5 FIX:fixed disabling switch option in dark mode
jira:[STUDIO-10545]

Change-Id: I63a6ace601edc6a84dcf37ad1c241d9dc4a0b4d6
(cherry picked from commit e146f07b88c17f1d3f2690bda6603c33080c750a)
2025-09-17 17:37:27 +08:00
xin.zhang
84fa72a8bb FIX: the nozzle data check
jira: [STUDIO-10528]
Change-Id: I5a20d52a92f4e6620239753a66fb5febcad19f39
(cherry picked from commit 679ec788e57932c2088b5b08f75128a93f0e0123)
2025-09-17 15:06:27 +08:00
xin.zhang
691d357606 FIX: disable editing while sending print job
jira: [STUDIO-10362]
Change-Id: Ie017db650699c64b751430a2bac2f9680626a750
(cherry picked from commit 79d626271cd1c7448e2cba5351b28d75652a710d)
2025-09-17 10:56:24 +08:00
xin.zhang
00181ad03e FIX: update some text
jira: [STUDIO-10352]
Change-Id: I33b02a811970002b5f05ee2e519eb722b19e7051
(cherry picked from commit 16729c9283f5adfc4100c8dc3db68f2bcb968670)
2025-09-17 09:30:07 +08:00
tao wang
074a9c1bba ENH:update options ui when printer does not match
jira:[STUDIO-9973]

Change-Id: Icca959d732f98e34b0a83fc2971c70b64d393d75
(cherry picked from commit e7454fa47d09c529db3262faf19e2e2f22bdb5d7)
2025-09-16 22:07:26 +08:00
tao wang
b1d020b5e8 ENH:disable printing when mapping is invalid
jira:[STUDIO-10250]

Change-Id: Ie14e601db9c844e7b23fd0f1e1fd688c03999144
(cherry picked from commit 2c433396fabd6239e9fbe6053f4b2fcd79a0d241)
2025-09-16 21:54:52 +08:00
xin.zhang
9fae879ba4 FIX: move the function to API
jira: [none]
Change-Id: I2b30082148d6d9b937a218e37464727ba8fdf131
(cherry picked from commit eb90f16dd57d69683f440a4ceb526dc66ff1b6cd)
2025-09-16 17:20:39 +08:00
xin.zhang
d13cddf03c FIX: update the message color settings
jira: [STUDIO-9903]
Change-Id: I73306d98d679620666a1ab68d5da7222b45cd332
(cherry picked from commit e43e4950da81a116a149f25be9219f107e9db3b7)
2025-09-16 17:02:14 +08:00
xin.zhang
22b7efc098 FIX: make the main area able to scroll
jira: [STUDIO-9878]
Change-Id: I89921f76b684a63bffde894eed89ecfa5d946b66
(cherry picked from commit 559eba688d399ef17ddc30750b9d00d01b9b33c2)
2025-09-16 17:01:03 +08:00
xin.zhang
4007c47585 FIX: make the tips as gray style
jira: [STUDIO-9646]
Change-Id: I88dcce6990e97ddea24d5726a3c728a5efd1fd6c
(cherry picked from commit b40306ac22aece60ebe1646534d1482020a84e6d)
2025-09-16 15:42:54 +08:00
zhou.xu
4d4bf64aad FIX:allow only External Spool color map
jira: STUDIO-10096
Change-Id: Ic0d2133fe688f275210df8f0a1adf1f29239598c
(cherry picked from commit 81ff3cdfce495d6847b0418ff4201d803fc8e84b)
2025-09-16 14:47:26 +08:00
xin.zhang
1b7f64ccd3 FIX: update message and translation
jira: [STUDIO-9580] [STUDIO-10092]
Change-Id: I133d23bef894d3784fa0e12c1d27a8a93448ebfa
(cherry picked from commit ea36ee5879b4b05b4d7ac98094697ce6e9eb1ba8)
2025-09-13 18:50:12 +08:00
xin.zhang
389a7ff3a6 FIX: update the bitmap by dpi
jira: [STUDIO-9952]
Change-Id: I88d91146c83d11f7dc87b4dd5698087a342646d4
(cherry picked from commit 05f67d14f6d1853739a38dd05d68a8553bb99a75)
2025-09-10 16:13:20 +08:00
tao wang
8267224756 ENH:some UI optimizations
Change-Id: I3395ab87552d6beb3481bf2049bfd1096933f36d
(cherry picked from commit 66a783d126e55360cbbc35503c03f0366aacdf68)
2025-09-10 15:26:13 +08:00
xin.zhang
9b1abd02ff FIX: move the message to dialog
jira: [STUDIO-9580]
Change-Id: I95f6d8ee56767b682956ce84cc74c096984afbef
(cherry picked from commit 3697ff05a4a6935422792b64fe1be4b6cc5be09d)
2025-09-10 14:47:41 +08:00
xin.zhang
b63e0ee556 FIX: disable send print while the ams is during setting up
jira: [STUDIO-9813]
Change-Id: I55dcca9aab4a9923636c1cf7a0a27bc7e4b9586d
(cherry picked from commit 5b800d034266489e5b288aa7a51ce6d244ae06b8)
2025-09-10 14:43:26 +08:00
zhou.xu
ad79ed6d93 ENH:add "SyncAmsInfoDialog"
JIRA: none

Change-Id: I8e26178f6da816e102a40b429c565696924c58ea
(cherry picked from commit 2a46460d5a65279cbb42c8aef2474172b1e1ae30)
(cherry picked from commit f7995d5a9f682107bd629841e2f903b0e6a0e7f2)
2025-09-07 20:55:54 +08:00
xin.zhang
c259360dff FIX: support dark mode for print option
jira: [STUDIO-9431]
Change-Id: I9b57f684e5a0b21a3f82b2138f568dd233b8d718
(cherry picked from commit 2a07fcf8b9eb7e6a3c3c104ac2eb9de51380aec0)
2025-09-07 00:50:53 +08:00
tao wang
50a9bb66ee NEW:display the count of ext filamend load
jira:[STUDIO-9243]

Change-Id: Idc1ad4b47fe1eb313439eab287a6e4b622247558
(cherry picked from commit 1d1b247a6295cef3bf4ab5e26e446eabfd39c207)
2025-09-07 00:49:46 +08:00
xin.zhang
669e5fe640 FIX: update the order of SelectMachineDialog
jira: [STUDIO-8235]
Change-Id: I8156032ec46464e375e74acaca5f4aa440298ce1
(cherry picked from commit 7b650e4aca6e1f2653e32acfe5d862573a62415d)
2025-09-07 00:17:26 +08:00
tao wang
bf81dcefe8 FIX:fixed the issue of crashing when changing DPI
jira:[STUDIO-9099 ]

Change-Id: I447a3f6dec830005494f291297097efe79d0f993
(cherry picked from commit 0174c991eb5bd1624192cacb323e6bd92ba74acf)
(cherry picked from commit 889c6165f9c44094882111198f1e98e9446938a4)
2025-09-05 18:13:00 +08:00
tao wang
d63f9ac76b ENH:check external storage
jira:[STUDIO-9125 ]

Change-Id: I3a764abfe3e9e6867562634bac19130b9905c581
(cherry picked from commit d6f90a65116c06717fec93ca7d11a4c801bc2f3c)
2025-09-05 17:59:13 +08:00
Stone Li
01052c9c15 NEW: add more info for multi-nozzles printers
JIRA: STUDIO-9111

Change-Id: I5ed619d57b6857f5d4a1e38662d2fe03640222a3
Signed-off-by: Stone Li <stone.li@bambulab.com>
(cherry picked from commit 993228d3e99e7976a3839b29453b53023ec18b71)
2025-08-28 15:01:52 +08:00
tao wang
27780819e1 ENH:dynamically update use_ams options
jira:[none]

Change-Id: Ia555b3375d3a195b8b6c0e0d6f65b78dd997c810
(cherry picked from commit 58d6ac32f99c700da90aca1ec7ba1d986eb2eff7)
2025-08-26 21:15:31 +08:00
Kunlong Ma
139826677a NEW: support send to sd card with cloud
JIRA: STUDIO-7378

Change-Id: I95fee50db29825e508d276d52c7a3e85e1347ebd
(cherry picked from commit 13db95ceb4f18b8cbce1e67447eeaa6ee36cc8ad)
2025-08-26 19:48:52 +08:00
tao wang
34a4946b3f ENH:auto adjust ams list size
jira:[none]

Change-Id: Ie8bba9a74ab5edc5a20724ceeee96069d9ad17dc
(cherry picked from commit 33bb1f69b1026b6d874f7cf164fbe50b8877ed58)
2025-08-26 19:42:27 +08:00
tao wang
40bdbed840 FIX:fix the logic of some sending pages
jira:[STUDIO-8890]

Change-Id: I22a29d236365052d4fbe31e69aea72efaa6aa88a
(cherry picked from commit 60986488e720998b5921060f01daaedaa8e865c1)
2025-08-26 10:54:51 +08:00
tao wang
9b97ebeec5 ENH:reduce the refresh times of sending printed pages
jira:[none]

Change-Id: Iaa4864afa09e71a7b8fd09baf289ee17fa07eafc
(cherry picked from commit a0c9fad05291e7614d94b7cec3c4f32d1f1345d8)
2025-08-26 10:53:15 +08:00
tao wang
fe6338449e ENH:Advanced option supports folding
jira:[none]

Change-Id: I7017ea4a246b05d142e4a49d499d57e46f3c4428
(cherry picked from commit eea4abe6b72229bdf3d7f4fb250341f3659e9ab1)
2025-08-26 10:52:43 +08:00
tao wang
2fe7f8c61b NEW:support previewing pad types
jira:[none]

Change-Id: I75285e8665a1efbfa02c2d859962ed958098bd07
(cherry picked from commit 22bb81e0cd9955146474a3e9e8ac02e4ed45551a)
2025-08-26 10:46:16 +08:00
tao wang
2e132ee835 NEW:new sending page layout(for top area)
jira:[none]

Change-Id: I359476fd80cd3fb3e55f071bf0e649e57e93ef2d
(cherry picked from commit aa3e21dc5bbb428ca5597d617f11400280de5d75)
2025-08-26 10:11:48 +08:00
tao wang
1af3b014a9 FIX:remove tips about AMS
jira:[none]

Change-Id: I1b44ac90ef31e105cb6e6804d25d5caa29915764
(cherry picked from commit 065bb6a7facebccdd74a1a3ec127185a0b349cd9)
2025-08-24 23:18:29 +08:00
tao wang
8f6cfda2f3 ENH:optimization of select machine page
jira:[for new selectmachine page]

Change-Id: I003889f6f675e08403160e410498b065cdfaf59e
(cherry picked from commit 9afe123026ba5a4ffc13f7f3ce0e04100418db03)
2025-08-24 23:18:28 +08:00
tao wang
49fdaf2f5d NEW:support new nozzle and extder data
jira:[new nozzle data]

Change-Id: Ief37b42794ce1469163fcd8227431ec77957508e
(cherry picked from commit db8ae4ccb3069347e1303de104302357bc352754)
2025-08-24 23:18:27 +08:00
tao wang
9b9e339d15 FIX:Fix the issue of text wrapping
Change-Id: I360c08e37d58359b30df460df07ed8266ac5dd6a
(cherry picked from commit 54a3e4786e11b47111b33a80788a376f0d238daa)
2025-08-24 23:18:22 +08:00
zhimin.zeng
ca6a3fe17b FIX: Prompt user when mix ams and vtslot in an extruder
jira: none
Change-Id: I9a1d4936056fc872c75bf0454e4ca89665ece2f8
(cherry picked from commit 65c00e00fe8709255c40e94679fa4ced6d3ae688)
2025-08-24 23:18:18 +08:00
Noisyfox
1a03d33795 Fix some build error 2025-08-24 23:18:16 +08:00
hang.xu
71b4962b83 FIX: Prevent sending print when nozzle type dismatch
jira: none

Change-Id: I0278fd9bc22a9d9fd44b4d776f54de5fc07db6d0
(cherry picked from commit d1aac2513e94721099286025bb32e613d0a429ac)
2025-08-24 23:18:14 +08:00
hang.xu
dd99af4cec FIX: double nozzle hybrid mapping
jira: none

Change-Id: I64908776a6265da7809814e62c9e7a860f39bffd
(cherry picked from commit c96102043bc46f134cf039edabd0d80877e9ef8e)
2025-08-24 23:18:14 +08:00
hang.xu
905f6b4291 NEW: two nozzles ams mapping
jira:[two nozzles ams mapping]

Change-Id: I914439114b2946cdc1e3e4eb07a37f75f0529c12
(cherry picked from commit 62ef51d0512bdbaf115b92d95ffd0407a15f48bb)
2025-08-24 23:18:04 +08:00
Noisyfox
5335357f4c ENH:optimization of select machine page
(cherry picked from commit bambulab/BambuStudio@9afe123026)

---------

Co-authored-by: tao wang <tao.wang@bambulab.com>
2025-05-26 17:41:58 +08:00
Noisyfox
65936b34c1 Fix crash when using old firmware 2025-05-24 18:37:35 +08:00
Noisyfox
1c58c933e2 Add missing print params 2025-05-14 20:39:27 +08:00
hang.xu
78a09d9be6 FIX: Add bed type in send print page
jira: STUDIO-7824

Change-Id: I64d9ed41b862ed4e3b8c21218c289132d767105e
(cherry picked from commit 7bb5060b739b3a95fe889ae64e8d7289e2c928d9)
2025-05-05 19:10:45 +08:00
tao wang
e4d8c2e440 NEW:support new mapping type
jira:[support new mapping]

Change-Id: I88e5d3b6966d4ed1e8098d13fe9335fecf6e01c4
(cherry picked from commit c0932e16ff9fcae0e900c6e0cac9a5b496d0cc0e)
2025-05-01 15:54:19 +08:00
tao wang
7fe421b1b3 ENH:support new amsmapping data
jira:[for 2 extruder]

Change-Id: Ie03eae17d600bc68451511a0179f20d1919ff6ea
(cherry picked from commit 0848c26da97c7b74e98645b9a0873fe928fdf631)
2025-05-01 15:54:18 +08:00
tao wang
9ab3107304 NEW:Support direct connection to LAN printers
jira:[connect printer]

Change-Id: Ifdc25651f4effde8e2a2d2a4e690aa20e0ef7022
(cherry picked from commit 0ec49c3588c1f81c159193de352f8a47d39ffe74)
2025-01-23 09:58:59 +08:00
SoftFever
7082e945b1 Revert "Fix Compile Warnings (#5963)"
This reverts commit b83e16dbdd.

Found regressions like auto orientation didn't work anymore after this change, revert it
2024-08-12 00:00:20 +08:00
Ocraftyone
b83e16dbdd
Fix Compile Warnings (#5963)
* Fix calls to depreciated wxPen constructor

* Fix use of wxTimerEvent

* Fix unrecognized character escape sequence

* Fix signed/unsigned mismatch

At least as much as possible without significantly altering parts of the application

* Clean unreferenced variables

* fix mistyped namespace selector

* Update deprecated calls

* Fix preprocessor statement

* Remove empty switch statements

* Change int vector used as bool to bool vector

* Remove empty control statements and related unused code

* Change multi character constant to string constant

* Fix discarded return value

json::parse was being called on the object, rather than statically like it should be. Also, the value was not being captured.

* Rename ICON_SIZE def used by MultiMachine

By having the definition in the header, it causes issues when other files define ICON_SIZE. By renaming it to MM_ICON_SIZE, this lessens the issue. It would probably be ideal to have the definitions in the respective .cpp that use them, but it would make it less convenient to update the values if needed in the future.

* Remove unused includes

* Fix linux/macOS compilation

* Hide unused-function errors on non-Windows systems

* Disable signed/unsigned comparison mismatch error

* Remove/Disable more unused variables

Still TODO: check double for loop in Print.cpp

* Remove unused variable that was missed

* Remove unused variables in libraries in the src folder

* Apply temporary fix for subobject linkage error

* Remove/Disable last set of unused variables reported by GCC

* remove redundant for loop

* fix misspelled ifdef check

* Update message on dialog

* Fix hard-coded platform specific modifier keys

* Remove duplicate for loop

* Disable -Wmisleading-indentation warning

* disable -Wswitch warning

* Remove unused local typedefs

* Fix -Wunused-value

* Fix pragma error on Windows from subobject linkage fix

* Fix -Waddress

* Fix null conversions (-Wconversion-null)

---------

Co-authored-by: SoftFever <softfeverever@gmail.com>
2024-07-29 21:00:26 +08:00
SoftFever
27f140fb18 Mdel preview renders the actual colors of the filaments based on the filaments currently loaded in the AMS
Ported from BambuStudio
2024-06-16 17:15:51 +08:00