Commit Graph

11961 Commits

Author SHA1 Message Date
SoftFever
0767d3a363 Merge branch 'main' into dev/p2s-pr 2025-10-28 22:19:27 +08:00
Valerii Bokhan
790bb39783 Fix: The fix of the adaptive layer height logic for supports (#10697)
Fix: Fixing the logic of the adaptive layer height for supports

Removing `tree_support_adaptive_layer_height` because its logic duplicates `independent_support_layer_height`
2025-10-28 17:31:49 +08:00
Noisyfox
06fbd3c087 Update color 2025-10-28 15:30:06 +08:00
milk
7c7d80479d FIX:change translation
jira:[none]

Change-Id: Ife277664dab5ad85cd39825ee1e163b21e5765a2
(cherry picked from commit d8fd4e23acf946c4c9adfd3c03642433dba27eb4)
2025-10-28 15:30:06 +08:00
milk
bfd8a0cbd7 FIX:add darkmode of thermalprecondition
jira:[STUDIO-14662]

Change-Id: I75998ff04e1073d07e23ff6970dce90627b7b860
(cherry picked from commit 93fc862f7e74c52d7a9cfb75d24ecf0685788341)
2025-10-28 15:30:06 +08:00
milk
2e19dfea93 FIX:reslove mac compatibility question
jira:[STUDIO-14604][STUDIO-14660][STUDIO-14662]

Change-Id: I71833726fb3533960e38f87324b7d3da566730d7
(cherry picked from commit 7e6a18c81d92517e5f421569d103502e44c703a5)
2025-10-28 15:30:06 +08:00
weizhen.xie
9f7ff97be6 ENH: add initial layer time to plate_x.json and slice_info.config
Jira: STUDIO-14504
Change-Id: I32460f1c19cce7c729806e35370e8b4b57aa069e
(cherry picked from commit 04a487d210134c28245c1f0f7d0986266a1c66f2)
2025-10-28 15:30:05 +08:00
milk
778874aa01 FIX:remove underline of thermal preconditioning
jira:[STUDIO-14597]

Change-Id: Ibf43718060b47cc4890b491500b6795d57bf6f8e
(cherry picked from commit 16df0fa6f9eb8049b0eb46bef81445112df10767)
2025-10-28 15:30:05 +08:00
milk
5cccdc7078 FIX:remove play of icon
jira:[none]

Change-Id: I64aa43ddf3088bde9296385f36db3e2782d0c280
(cherry picked from commit db2d72cc42f564e37c1de13340555dd2ae745045)
2025-10-28 15:30:05 +08:00
milk
ffab04262d ENH:Add thermal precondition
jira:[STUDIO-13970][STUDIO-13904]

Change-Id: I4b4fa27da1a65e0019c5f4c1dcc099c92189bf50
(cherry picked from commit 92dbde8385fec9719e0e9cfde764421793decd4d)
2025-10-28 15:30:05 +08:00
Bastien Nocera
69ecdeba71 FIX: Fix missing std::optional declaration
/run/build/BambuStudio/src/slic3r/GUI/DeviceCore/DevFilaAmsSetting.h:16:10: error: ‘optional’ in namespace ‘std’ does not name a template type
   16 |     std::optional<bool> IsDetectOnInsertEnabled() const { return m_enable_detect_on_insert; };
      |          ^~~~~~~~
/run/build/BambuStudio/src/slic3r/GUI/DeviceCore/DevFilaAmsSetting.h:4:1: note: ‘std::optional’ is defined in header ‘<optional>’; this is probably fixable by adding ‘#include <optional>’
    3 | #include "DevCtrl.h"
  +++ |+#include <optional>
    4 |

/run/build/BambuStudio/src/slic3r/GUI/DeviceCore/DevFilaSystem.h:174:10: error: ‘optional’ in namespace ‘std’ does not name a template type
  174 |     std::optional<bool>  IsDetectOnInsertEnabled() const { return m_ams_system_setting.IsDetectOnInsertEnabled(); };
      |          ^~~~~~~~
/run/build/BambuStudio/src/slic3r/GUI/DeviceCore/DevFilaSystem.h:13:1: note: ‘std::optional’ is defined in header ‘<optional>’; this is probably fixable by adding ‘#include <optional>’
   12 | #include <wx/colour.h>
  +++ |+#include <optional>
   13 |

(cherry picked from commit fa482b1c0dc7faa2ad87c37eb7f1ea2ce87a5084)
2025-10-28 15:30:05 +08:00
hemai
967b7a5050 ENH: support nozzle refresh for H2D Pro
Jira: [STUDIO-13185]
Change-Id: Ib8b5905c32f83b1f849ad4ed327c9d77826d6a18
(cherry picked from commit c603e0f88be71a301ed2fc7f6fff2a34398b6708)
2025-10-28 15:30:04 +08:00
haolin.tian
9013254def FIX: Prevent refresh during connection
jira: none
Change-Id: I84fda87d4b62d6cf2b22614336336aae5229feca
(cherry picked from commit 920bb3da0160c63cee66958a7b59d3ae5314ca88)
2025-10-28 15:30:04 +08:00
hemai
2db929a805 FIX: delete old error code
Jira: [STUDIO-15017]
Change-Id: Ib2e5d3b658b156de8bf0b4ccc32f66b3bb22a642
(cherry picked from commit ef9598cbd52b99ce147a0a5a877d7b3403e4335c)
2025-10-28 15:30:04 +08:00
xin.zhang
e686424e8c FIX: FanControlPopupNew::init_names
JIRA: [STUDIO-14993]
Change-Id: Ie33bcde858ef379deaaeea99f790fd880eb0184e
(cherry picked from commit 3b7016d5598b2e655446019d8ad710e1612281a2)
2025-10-28 15:30:03 +08:00
xin.zhang
d852ceddc6 FIX: PrintStatusFilamentWarningHighChamberTempCloseDoor
JIRA: [STUDIO-13676]
Change-Id: Ia9405ebbbad69ccc2407fdecb4a15b39c1caec58
(cherry picked from commit a81d8720b9f8c157faa55300b3f1afd4c0e46ea9)
2025-10-28 15:30:03 +08:00
milk
bf5a0c0084 FIX:change dark mode color of send page
jira:[none]

Change-Id: I21e4d76628315944f55e3df17b40208aa63fd9ec
(cherry picked from commit f66994b1bb1bc95739b1a9b8952f82d62abf0a36)
2025-10-28 15:30:02 +08:00
xin.zhang
223eaa5d2f ENH: add notice for PrintStatusAmsMappingInvalid
JIRA: [STUDIO-14577]
Change-Id: Ibcd742c109970490998fcf90f5520afcda5a4244
(cherry picked from commit 662338ab0e2e82db48dc173f3413a11302285132)
2025-10-28 15:30:02 +08:00
zhou.xu
0eca9eefb8 FIX:add m_new_project_and_check_state flag
jira: STUDIO-14994
Change-Id: I068b18cfb29622de1641bc34c671d4710c1a07d3
(cherry picked from commit 670fb1764748e0d69cb2b4e657bfbd5c92daff9f)
2025-10-28 15:30:02 +08:00
milk
f63cdc30e4 FIX:change interface for send
jira:[none]

Change-Id: Ia59bb1bb606399541aa191991ff0fb3f106d75d1
(cherry picked from commit b22af6cfe0a589ae5fa2e95a01ebe47f6742ee99)
2025-10-28 15:30:02 +08:00
weizhen.xie
edced8d5a6 Fix: When the flushing multiplier is 0, a warning popup should also be displayed.
Jira: STUDIO-14962

Change-Id: Iee6887fb6ed6941bbd58d9d2b834b6654ee9c806
(cherry picked from commit 43dbb7f228afb4304b6ea398991efd2659feafbe)
2025-10-28 15:30:01 +08:00
hemai
a2d113111b FIX: ams PA display for A series printer
Jira: [STUDIO-14883]
Change-Id: Icdaf5350772fc6420421b13868d973d99c7831b8
(cherry picked from commit 6b15a2bb0c5ca9df8835c55f48bbbb613d4770f5)
2025-10-28 15:30:01 +08:00
weiting.ji
d7f66b289d FIX: Mode switch button animation lost
Jira: STUDIO-14878
Change-Id: I53f7009ac3db692c7218a86cd7333261a2423c5b
(cherry picked from commit ec43e13d3907bc2b120f796f8a9b1df767291c5b)
2025-10-28 15:30:01 +08:00
milk
9e1b142ed5 ENH:change send mode(master three patchs merged in this)
jira:[STUDIO-14427]

Change-Id: I1081e5252be3d932b2ffa29f70cbf93fee57eef9
(cherry picked from commit 662b7fdac8a999e54942cc9be0e5e2c2b8a90f06)
2025-10-28 15:30:01 +08:00
hemai
104cbb7b9b ENH: support E3D print parts display
Jira: [STUDIO-14908]
Change-Id: Ie8273eb6f74a3e7508f440d2092bb48f2e1dbb10
(cherry picked from commit a4218e991e6367e3f1ee3802e785802df2ad6d41)
2025-10-28 15:30:00 +08:00
xin.zhang
c382a8a9c3 ENH: support_clump_position_calibration
jira: [STUDIO-14896]
Change-Id: I2913a1e4022686889aaa94ee31b787930200d02d
(cherry picked from commit 14370c8910878c2182189b42e013c1323615c310)
2025-10-28 15:30:00 +08:00
hemai
0b805a7145 FIX: add protection for rescale_camera_icons
Jira: [STUDIO-14633]
Change-Id: Ic88bc5ec6f49e644304f8db374a930d663825819
(cherry picked from commit 8bd642de670fa709dcd3ec0e852599e596da4cb4)
2025-10-28 15:30:00 +08:00
weiting.ji
7eaabc4856 FIX: Trigger project restore when opening local files
Jira: STUDIO-13977
Change-Id: I9f3a14bbc699337f11e2f44464525c183e4ebce8
(cherry picked from commit 2ce94980f15b2cd19e735a1c723bb7eae45be859)
2025-10-28 15:30:00 +08:00
milk
5f26bc9e6e FIX:Change model name for upgradepanel
jira:[STUDIO-13910]

Change-Id: I2afad42cdd8907252203fe6d1a552d8d3cf2c2df
(cherry picked from commit 5aa8921e4ab4d687a2ec93b73489f6215b72dbd2)
2025-10-28 15:30:00 +08:00
milk
0313680701 FIX:Change exceed 16 colors text
jira:[STUDIO-13236]

Change-Id: Ife045717889713d476fcf377beb50bcb5f88df91
(cherry picked from commit cb0c120653d9b958a0fede3c1cb66f00e17f5e84)
2025-10-28 15:29:59 +08:00
xin.zhang
efc2da6549 ENH: add notice for PrintStatusAmsMappingInvalid
jira: [STUDIO-14577]
Change-Id: I9c875ef07da8f7b56eee1923afd9fa5e9f346255
(cherry picked from commit ad0c04c57848325dcd3e57a67a29207f57f0207d)
2025-10-28 15:29:59 +08:00
milk
f4848a5782 FIX:Add print option for a1
jira:[STUDIO-14870]

Change-Id: I0d550e15dba4ccc6a30faad56041f476bfe0fd07
(cherry picked from commit 309a01f1853c52630ba2206d2927f4113cf0fa6b)
2025-10-28 15:29:59 +08:00
zhimin.zeng
0964a9a85c FIX: the bed_type is incorrect for flowrate cali
jira: STUDIO-14901
Change-Id: I8a1fcdf5eb051a81f0fcd0c5d9a590bce2646994
(cherry picked from commit 49edbe52572137ff79f1b17dab261d5b800b2499)
2025-10-28 15:29:59 +08:00
zhimin.zeng
d4e1d7dfb2 FIX: the nozzle volume type is not correct for manual cali
jira: STUDIO-14759 & STUDIO-14758
Change-Id: I4496583d1ddce8802aac11b1d094ae7bce640eb2
(cherry picked from commit f50d4e346eea362a1ca9de16d8bcf7b9f2cd0cd3)
2025-10-28 15:29:59 +08:00
weizhen.xie
80f4a7a40f Fix: Fix the bug where switching languages on macOS caused a freeze.
Jira: STUDIO-14688

Change-Id: Iadbaa91e8ed9259f514428bcd7dd66308cdcc388
(cherry picked from commit 84c7fafcca503c00a8ef92f23ade2c2ce871849e)
2025-10-28 15:29:58 +08:00
haolin.tian
0d01352658 FIX: fix typo error
jira: none
Change-Id: I46ec6aba4af57e3dfb8ef84f2f897bb24c064730
(cherry picked from commit 5c1f8f50ede08c822040d2fe2dd0c49e05a0d553)
2025-10-28 15:29:58 +08:00
xin.zhang
ff1e48a9c4 FIX: the event should be skipped, so that the CheckBox could be toggled
JIRA: [STUDIO-14861]
Change-Id: I72e9e77c0e81e9cf64de7258ca09c225d5c3f807
(cherry picked from commit 9861c3d6bcd7e2720d1fccaacb820e13b5d7adb7)
2025-10-28 15:29:58 +08:00
xin.zhang
8d3da67254 FIX: the sorting of AMS list
JIRA: [STUDIO-14738] [STUDIO-14651]
Change-Id: I6d4b89edc77383be8afacf9823567bc756c8e2ed
(cherry picked from commit 8defa1f50b4b556c6ebaf2ad533ba09ad3f23e38)
2025-10-28 15:29:58 +08:00
xin.zhang
2234b227c4 ENH: the old protocol only support AMS_LITE
JIRA: [STUDIO-14841]
Change-Id: I6040d54490a79b323fcd7000a638e5fc4b45b0b4
(cherry picked from commit b6274332d7dc8077b2612ef4518a9cbaf12123d9)
2025-10-28 15:29:58 +08:00
xin.zhang
9d73426c0a ENH: remove Remove unnecessary restrictions when Load or Unload
JIRA: [STUDIO-14269]
Change-Id: I1663f664d7e3248fa3be29f6040247c0ab3b03c4
(cherry picked from commit 79689556eb247240cf57323706411d3d9f6116a5)
2025-10-28 15:29:58 +08:00
haolin.tian
62bf7d1355 FIX: pass try_emmc_print flag when print
jira: [STUDIO-14427]
Change-Id: I3b765e4ea3f290bbc95616f07b416a72f60c7bc5
(cherry picked from commit 39aa7ede7f4cfee20db8f6040a17317a72c9c95e)
2025-10-28 15:29:57 +08:00
hemai
4a51ef7f91 FIX: update proceed action ack param
Jira: [STUDIO-14689]
Change-Id: If424997b9ed05ab95f048424b8950f927ea9b608
(cherry picked from commit 8c712f49caf7a7f0d0fcef7a7c392170ae699ba4)
2025-10-28 15:29:57 +08:00
xin.zhang
1ea5aa9017 FIX: FanControlPopupNew update the Layout and Refresh
JIRA: [STUDIO-14785]
Change-Id: I91c930d0e1b92dd5f2e4d21f3d851e5826307071
(cherry picked from commit 2f25351f330c1c3c6f2bda7a178946b923a4cc2f)
2025-10-28 15:29:57 +08:00
zhimin.zeng
55d8685952 FIX: Should not enable wrapping detection when switch to X/P/A
jira: STUDIO-13992
Change-Id: I5912891bb0b839e64f9d49aa9ed91d2bfd922dcb
(cherry picked from commit 8c4598d4764aa4126a415efd6ab3d51ab78dedb0)
2025-10-28 15:29:57 +08:00
haolin.tian
aa75c444aa NEW: print with emmc
jira: [STUDIO-14427]
Change-Id: I8b0c56ce1c2b7b90949b72c49acfdbb31c876df1
(cherry picked from commit 76e45bde2540ee418719e00b999c5fd724baec71)
2025-10-28 15:29:57 +08:00
milk
d6e40352c2 FIX:Add colors exceed message
jira:[STUDIO-13236]

Change-Id: Id5b761a661c4b0d47cb8cd600a061b403dce0ae8
(cherry picked from commit 7a11f7e8ca0cb08c08b8a1e62f77b670b61aa094)
2025-10-28 15:29:57 +08:00
hemai
34a6100fe6 FIX: add ui_op_lock for cali history operation
Jira: [STUDIO-14419]
Change-Id: I5242a0a56c9fd2459bd681fc32e3d1edd3b19d66
(cherry picked from commit ea7a39ecf0955efe7781f44ec7d3ea3900a43711)
2025-10-28 15:29:57 +08:00
xin.zhang
46fd6c9794 ENH: ColorPicker use the bmp size
JIRA: [STUDIO-13908] [STUDIO-14242]
Change-Id: Iac008bcc483b31e3f7e7278a0eea20823eb3bf70
(cherry picked from commit ad9902537c4b1842fd29cfd9fb9eb70681c78327)
2025-10-28 15:29:56 +08:00
xin.zhang
d5da6b834b ENH: AMSSetting do not show insert read for A with AMS Lite
JIRA: [STUDIO-14575]
Change-Id: Id5593a4c034ba067cf2f40f3b632e55291468189
(cherry picked from commit ea4629b1cdb8479e6f69e37b497eb292ef415c06)
2025-10-28 15:29:56 +08:00
xin.zhang
934f32bd8c FIX: remove some warnings
jira: [none]
Change-Id: I0e74b7316d0efe38c65e1f695b2a09eb09103552
(cherry picked from commit 766c6e004145325bcc7a6addfce27842ee9504de)
2025-10-28 15:29:56 +08:00