Commit Graph

28896 Commits

Author SHA1 Message Date
xin.zhang
3ba39f694b ENH: update the filament color codes
jira: [STUDIO-12346]
Change-Id: Ibf1ce492f43a50aab0bd356494d9ec8a22eb201e
(cherry picked from commit 9e53f6c6bf06ce2c097f617d528ac6f95406b3b1)
2025-09-28 13:08:23 +08:00
xin.zhang
1635ce28d6 FIX: the sort function of FilamentColor
jira: [STUDIO-12965]
Change-Id: Iadd8342f3b67877e8b41c28d87f5150528f340a9
(cherry picked from commit b56ca2f5f619bbafd5473416ab9bf599d2a05e7e)
2025-09-28 13:08:09 +08:00
lane.wei
bb08bb0e6d ENH: presets: add logic to process filament preset splits
jira: STUDIO-12952
Change-Id: I232434fb4b1d53a7379be2f745457a83bf923677
(cherry picked from commit b9f584281ae801a3ee542c1ebd81c6cb7dd35cde)
(cherry picked from commit 9b1f5496aef411218d538a07386fccb2a085435b)
2025-09-28 13:07:55 +08:00
qian.wang
0f96e397f5 ENH:[filament/process] format bbl process file
Change-Id: I1bf9983e4ed046c5f1b4b8b18c8f756dac8709bc
(cherry picked from commit 0317857fd5d9ddf0c71b53c68308415a0a06c891)
2025-09-28 13:06:35 +08:00
shsst
a42c933756 ENH:[Process/Filament] Split PLA Basic PLA Matte ABS ASA 0.6 layer height and volumetric flow modification Profile Edited by wenwei.huang
Change-Id: I552dfb8e3370a4ad9072b0d8b5b0c577fb9ccb12
jira: None
(cherry picked from commit 234e9c359f90b11bc6cbf4fb9cc2db492a59ef71)
2025-09-28 12:57:24 +08:00
milk
7a59122f7a ENH:refine printer function option
jira:[STUDIO-12357]

Change-Id: Ie48fb2302279795f41f8b65856bd64b64d2b14f3
(cherry picked from commit 1af87a5309a311e1c2d2c96d757ed7723bd373fb)
2025-09-28 11:39:53 +08:00
milk
3a3f6d3a43 FIX:Disable when the AMS slot is empty
jira:[STUDIO-12764]

Change-Id: I9baea63965159f9416d91e6dea40962ec292b9e2
(cherry picked from commit 5aff60e9840343e5465833259cca2d8658a8fce7)
2025-09-28 11:39:24 +08:00
lane.wei
18b9bffd02 ENH: 3mf: fix save fullpath issue
jira: no-jira
Change-Id: I3077cceae2dfadc2882b4eb1de2234c5c445f342
(cherry picked from commit 5776d8e3fc4f8578b9ed397bd0afe0f9668cd634)
2025-09-28 11:38:31 +08:00
xin.zhang
4f8f642655 ENH: suite to DPI change for score panel
jira: [STUDIO-12923]
Change-Id: I22bb0d8ebd13d23f46bd785d3a4848669185175d
(cherry picked from commit 187040d70c9416f5f3ca9dbe74f1d1d09cb23218)
2025-09-28 11:38:17 +08:00
zhimin.zeng
7667e188d7 FIX: flowrate cali adapt to new protocol
jira: STUDIO-12834
Change-Id: I892219350d6dd46bc92037c146af1911214d598d
(cherry picked from commit b86677be4e5771da4362ea41dfeb3a161fcc33f7)
2025-09-28 11:36:07 +08:00
xin.zhang
c415eea556 FIX: use data to check the fan control
jira: [STUDIO-12917]
Change-Id: I74f816a21beb2dfb4191bb73298882efd22a6191
(cherry picked from commit 4f0f4fc64802d777d11105d433e59f57168bfd66)
2025-09-28 11:35:57 +08:00
xin.zhang
1e9febbe4d ENH: add some support for fan control
jira: [STUDIO-12076] [STUDIO-12373]
Change-Id: I04e23acc802987dc7a657274074abb961f692896
(cherry picked from commit 359d52c9139b7a1aae59b990dc03f45ce4a1bc89)
(cherry picked from commit 9e16d9a4a6ce059dc134ffd388b753490dff0946)
(cherry picked from commit 4cdd1937fea90c3dd1cf0c73a7cd5172346abb40)
2025-09-28 11:35:50 +08:00
xin.zhang
95027d72db FIX: DPI scale for TempInput
jira: [STUDIO-12907]
Change-Id: I7d9751856cb69babb7093973136bdfd9fad4f501
(cherry picked from commit 03adbd4becf1106d02ac4c8251bc3dbfe84c517d)
2025-09-28 11:35:44 +08:00
Noisyfox
03e056e278 Merge remote-tracking branch 'upstream/main' into dev/h2d-2
# Conflicts:
#	src/slic3r/GUI/GUI_App.cpp
2025-09-28 11:09:24 +08:00
Noisyfox
82079ea16c Allow negative vector index 2025-09-28 11:07:28 +08:00
Noisyfox
81978dc558 Allow referencing a vector without explicitly specify the extruder id 2025-09-28 10:51:40 +08:00
SoftFever
f020480900 Revamp OrcaSlicer updater (#10884)
* Revamp OrcaSlicer updater
2025-09-28 10:33:33 +08:00
Noisyfox
7de52de353 Fix plate name 2025-09-28 09:12:16 +08:00
Noisyfox
042cf84614 Update color 2025-09-26 23:00:03 +08:00
Noisyfox
c64ee8156c Fix crash 2025-09-26 22:29:23 +08:00
Kunlong Ma
5a6cbc0a9a NEW: support send to sd card with cloud
JIRA: STUDIO-7378

Change-Id: I95fee50db29825e508d276d52c7a3e85e1347ebd
(cherry picked from commit 13db95ceb4f18b8cbce1e67447eeaa6ee36cc8ad)
2025-09-26 22:29:12 +08:00
Noisyfox
dc494da0b3 Move earcut to deps_src 2025-09-26 17:16:20 +08:00
Noisyfox
2c6bb1a443 Update layout 2025-09-26 15:21:23 +08:00
Bastien Nocera
2048f57cda FIX: Fix missing std::map declaration
/run/build/BambuStudio/src/slic3r/GUI/SkipPartCanvas.cpp: In lambda function:
/run/build/BambuStudio/src/slic3r/GUI/SkipPartCanvas.cpp:55:14: error: ‘map’ is not a member of ‘std’
   55 |         std::map<cv::Vec3b, int, std::function<bool(const cv::Vec3b &, const cv::Vec3b &)>> colorCount(
      |              ^~~
/run/build/BambuStudio/src/slic3r/GUI/SkipPartCanvas.cpp:13:1: note: ‘std::map’ is defined in header ‘<map>’; this is probably fixable by adding ‘#include <map>’
   12 | #include <filesystem>
  +++ |+#include <map>
   13 |

(cherry picked from commit b9402b5be60188e8867471b64c3bc1d8c1d6bfa7)
2025-09-26 14:38:45 +08:00
Bastien Nocera
13d92131e7 FIX: Fix missing BOOST_LOG_TRIVIAL() declaration
/run/build/BambuStudio/src/slic3r/GUI/SkipPartCanvas.cpp: In member function ‘void Slic3r::GUI::_BBS_3MF_Base::log_errors()’:
/run/build/BambuStudio/src/slic3r/GUI/SkipPartCanvas.cpp:598:47: error: ‘BOOST_LOG_TRIVIAL’ was not declared in this scope
  598 |     for (const std::string &error : m_errors) BOOST_LOG_TRIVIAL(error) << error;
      |                                               ^~~~~~~~~~~~~~~~~

(cherry picked from commit dba7f3ad07f530ddce3e75eaf8f357794cfd1935)
2025-09-26 14:38:38 +08:00
Bastien Nocera
22c42323a4 FIX: Fix missing boost::lexical_cast declaration
/run/build/BambuStudio/src/slic3r/GUI/PartSkipDialog.cpp: In lambda function:
/run/build/BambuStudio/src/slic3r/GUI/PartSkipDialog.cpp:495: error: ‘lexical_cast’ is not a member of ‘boost’
  495 |                     url += "&refresh_url=" + boost::lexical_cast<std::string>(&refresh_agora_url);

(cherry picked from commit fc8537c038a8dcc419f8b5558feb71700b77c996)
2025-09-26 14:38:31 +08:00
hemai
b4c08f9bdf ENH: disable skip when objects number>64 or model is not support
Jira: [TUDIO-13411]

Change-Id: I93617965e69ba72a1cc34dd0981b8fd92eb58d3a
(cherry picked from commit 417109e5f02613bd18eae125705effa7ae61cfda)
2025-09-26 14:35:06 +08:00
hemai
6148c73ffc FIX: scroll view can't slide && cnt_label display incomplete
Jira: [STUDIO-13176]
Change-Id: I32dfc793a431412a7df02ae2b9d952d175d97deb
(cherry picked from commit bdda60dd1dc37a4750cdb7b426de9e9518c581ea)
2025-09-26 14:34:35 +08:00
haolin.tian
219300277c FIX: adjust ortho, do not scale source image
jira: [STUDIO-12333]

Change-Id: I4fabccc9c489ed7fa4a8ad1239ed26c1710b3ee9
(cherry picked from commit 3fbb9946d1deee1855498e97cc66844e1f2e54aa)
2025-09-26 14:32:29 +08:00
hemai
b49ca90940 FIX: printer file system network reconnect bug && invalid obj bug
Jira: [STUDIO-13295]
Change-Id: I3b0c907ab4357d09ad592a0d937d83aaa15e8680
(cherry picked from commit 928d6b4c6a8c3ea8c9bd179c51afdb7dc55f45ce)
2025-09-26 14:31:47 +08:00
hemai
ddf6ed00c5 ENH: if nothing selected then disable aplly btn && update plate index parse
Jira: [STUDIO-13299]
Change-Id: I1ce7271d005f7fec4d71ece9db13916a9fcc1e1d
(cherry picked from commit b2386964814dee68a1936da912eea339f5317ddc)
2025-09-26 14:30:21 +08:00
hemai
7d147cc550 FIX: parts file download failed && canvas display error
Jira: [STUDIO-13253]
Change-Id: I6ce11c0ceb1c4f7ed49c41eb9c6d7a6d96e866f9
(cherry picked from commit 37f742007bc168d8a3365ca617c7bd27bafca038)
2025-09-26 14:30:07 +08:00
hemai
1928add5a1 FIX: partskip button display bug && cavas update bug
Jira: [STUDIO-12687]
Change-Id: Ibb42dab945be9b9b4b8b8ac8f2c268960d553325
(cherry picked from commit 15d8fb70c93d243a1592c050302e76867ed6582c)
2025-09-26 14:28:27 +08:00
hemai
17ed76a033 FIX: update SkipCanvas to SkipPartCanvas
Jira: [STUDIO-12687]

Change-Id: Ib50b7711ced0c3261586faae37ecc9054ea81183
(cherry picked from commit 7b4792d823a1b29ca3fe7f500ed30bd4211770d6)
2025-09-26 14:26:34 +08:00
hemai
5bc21568cf ENH: advance part skip dialog
Jira: [STUDIO-12687]

Change-Id: Ie6805c57f478ae5a10f81b49dc5a4e45fb40dbc7
(cherry picked from commit 8ed17efc32f8c635dc50e27bf7146fd2eb70941d)
2025-09-26 14:25:55 +08:00
Noisyfox
7a90b26e57 OpenCV don't build its own libjpeg, to avoid symbol conflict 2025-09-26 13:29:14 +08:00
hemai
df5bf0ae29 ENH: support parts skipping function
Jira: STUDIO-12687
Change-Id: I244cb611954590bd5e741f0d2701f359426a33a2
(cherry picked from commit e7e90e0f8ca0106a51d18d83efa0de56b332ddc0)
2025-09-26 10:55:19 +08:00
milk
10428f71c0 ENH:Optimization of File Transfer System Part2
jira: [STUDIO-11777]

Change-Id: I12744db7d2e3b53425454d632533768c54524677
(cherry picked from commit 4358e9ce351c5784e392a75d1ffcf2f54e1916ec)
2025-09-26 10:55:19 +08:00
milk
32c055ca7a ENH: Optimization of File Transfer System Part1
jira: [STUDIO-11777]

Change-Id: I733fd3532caa19546763ab8a72eb7667d5ffec53
(cherry picked from commit aa52c99076a78e2c8fd8d4e4b0b64de0bc761469)
2025-09-26 10:55:19 +08:00
Kunlong Ma
70c0b116fc FIX: fix some issue in sending files to external storage through cloud
JIRA: STUDIO-9372 STUDIO-9374 STUDIO-9368
If the printer version does not support uploading, the original protocol
will be used

Change-Id: I3d47ac2567c2c6709a5b983ff1ad552d9a8606d4
(cherry picked from commit b8dde8ae7f4f5883fc163c57bb607a08ecdabf2b)
2025-09-26 10:55:19 +08:00
Noisyfox
48149ed3c0 Fix spacing between slice and print buttons 2025-09-25 23:46:47 +08:00
Noisyfox
435faed968 Hide nozzle flow selection 2025-09-25 21:33:03 +08:00
Noisyfox
3c981f4113 Fix printer info sync 2025-09-25 21:14:51 +08:00
fei2.fang
008a98ccda FIX: Align printer preset controls in sidebar
jira: STUDIO-12397
Change-Id: I728d84b8862de0a72ef467388cbf4c63b24fdcc8
(cherry picked from commit 7ceff77207916b059aa1add0f9869d0e55a59023)
2025-09-25 20:48:14 +08:00
zhimin.zeng
a776c9ae56 FIX: the manual cali image changed incorrectly for multi_extruder printer
jira: STUDIO-12912
Change-Id: I5315d62689d40dddfa1b804220efcd1fa7c872b4
(cherry picked from commit 91a2c4b68a69cc4d927fe24ffdffbe261b33ea68)
2025-09-25 20:44:24 +08:00
noisyfox
69d5b4ae48 Fix build error when PCH is not used 2025-09-25 20:33:50 +08:00
xin.zhang
cc358aa945 ENH: update the log trivial for parse_json
jira: [none]
Change-Id: I66fd48435ddd6164f848f324ffb210d24e42857c
(cherry picked from commit aa1cad57f95602a53c57043be2bf3a11b627223f)
2025-09-25 17:36:50 +08:00
xin.zhang
dcf3505bb4 FIX: the printer name not display
jira: [STUDIO-12821]
Change-Id: I8e99f3c09446fcdc542b61479bbcbd38fb77aaf2
(cherry picked from commit bd1d5dcce03b4de1229926f54816a6bcf953a2f2)
2025-09-25 17:36:37 +08:00
xin.zhang
88eae5d217 ENH: supporting encoded filament color
jira: [STUDIO-12346]
Change-Id: I7f5ce7806acb6fdeb3e3d9db52a0b96e5fadd759
(cherry picked from commit a7bdc2707d3825327258965c90c33836a7da628b)
2025-09-25 17:36:29 +08:00
lane.wei
98a32f57aa FIX: CLI: fix the default wipe_tower_x incorrect issue
jira: no-jira
Change-Id: I847a0fc0e69bfdf80cea68cafabaac1daee98b8a
(cherry picked from commit 5b8af6cbe60c1a6a3fc11b5275131d4895d2f838)
2025-09-25 17:22:35 +08:00