Commit Graph

11216 Commits

Author SHA1 Message Date
xin.zhang
42fe1d4f8b FIX: recheck if the ext is used
github: [issues-6179]
Change-Id: I12a5ca2d3873f798d5d195adaf64abfec1f3245d
(cherry picked from commit 2c10531348d4b535e8ca49294e78d0ddf9da467d)
2025-09-20 15:37:23 +08:00
maosheng.wei
6aa49dcc12 FIX: Material name transcoding issue in AMS Materials Setting
github: #6190

Change-Id: Ie43cf9ab9b59b0cb9e7b03a61601716f6fff2217
(cherry picked from commit 33193459219c7b39a2cd0ee1dfc8c57e39cfa755)
2025-09-20 15:37:16 +08:00
洋葱
220d2fd574 Revert "ENH:direct connected devices support fram mode"
This reverts commit dc032e6b719d5d3526f9e757dde884e32583be46.

Reason for revert: <just reverts>

Change-Id: I7e9050cd48d59270fb23b6430990a2c88f3fabab
(cherry picked from commit be08d1d793acf104e1d541c2bd2a49f868ed6189)
2025-09-20 15:36:07 +08:00
zhimin.zeng
00f5812aba FIX: fix the error display for ext slot
jira: none
Change-Id: I940554e6b1a5c8c609561670db79948c9efed63d
(cherry picked from commit 72b5ab7ee4f59287dd1888c1c4a1f86466fc1afe)
2025-09-20 15:31:33 +08:00
zhimin.zeng
3d5abeba60 ENH: Updated calibration UI for single-extruder printer
jira: none

Change-Id: I4e2d97f38699b13e2bced8f6a37c952f7903aa27
(cherry picked from commit 2e3a5e8ca71e3e9426412f8bd07b916f6be45aed)
2025-09-20 15:31:26 +08:00
xin.zhang
fcfb6ac093 FIX: show ams remain for MAC
jira: [STUDIO-11139]
Change-Id: If5b9593e0b46e3f6845bb5637564cee8fa67e5bc
(cherry picked from commit 2d99a9e23106a631f9d1875f71f0910b093de657)
2025-09-20 15:30:19 +08:00
xin.zhang
f9a7f056e9 FIX: use different ext image for different machine
jira: [STUDIO-11133]
Change-Id: Ice69b4f33317e23a2c2d7b8fbdfc94402b4bba28
(cherry picked from commit a67acd8f0ced49052cfe0c4b01a5bf159b046e85)
2025-09-20 15:30:14 +08:00
zhou.xu
327f64c093 ENH:add "is_blocking_printing" api
jira: github 6181
Change-Id: I8c8659da0b27204c53d03cbbd8d410504b3fd434
(cherry picked from commit c52681071782d137338436640cd990057579949b)
2025-09-20 15:30:09 +08:00
tao wang
157bec00a1 ENH:auto switch use ams option
jira:[none]

Change-Id: Ia1d5231284515226277b16d771342141e654a23d
(cherry picked from commit 956f1b9a59c11bce0428c3162beac45a5272c919)
2025-09-20 15:30:05 +08:00
tao wang
2bc9cb4441 ENH:direct connected devices support fram mode
jira:[none]

Change-Id: I539698e6440bf67b1951938c3c0b7d51ab74c1b3
(cherry picked from commit 1b0e8cdb318eb67c5d791835a09cccb1e1e7d9fe)
2025-09-20 15:29:59 +08:00
zhou.xu
6c03cd6178 FIX:fix dark mode show of right_tip
jira: none
Change-Id: I6ce7edec772c5d1bbdc372fcde25807a0a744916
(cherry picked from commit 36692d649c13a0a3cec95fbf12960dcc91970d8c)
2025-09-20 15:29:52 +08:00
zhou.xu
a65abbeb58 FIX:m_show_type should init default
jira: github 6146
Change-Id: Ie948a37cfda030a9e10efe0b8d260918b3fb9e4c
(cherry picked from commit 28bdf64fef8d7cbef15f27ffcc2c841595ba08c7)
2025-09-20 15:28:40 +08:00
Noisyfox
c26266dfb6 Merge remote-tracking branch 'remote/main' into dev/h2d
# Conflicts:
#	src/libslic3r/CMakeLists.txt
#	src/slic3r/CMakeLists.txt
2025-09-20 13:10:10 +08:00
Dipl.-Ing. Raoul Rubien, BSc
75ed995b00 Fixes 50 Compiler Warnings: Add SYSTEM toCMakeLists.txt (#10653)
* src/*/CMakeLists.txt: adds SYSTEM to arget_include_directories()

* src/*/CMakeLists.txt: removes duplicate sources from lisbslic3r_sources and SLIC3R_GUI_SOURCES"

* .gititnore: adds CMakeLists.txt.user and CMakeLists.txt.autosave

* deps_src/*/CMakeLists.txt: adds SYSTEM to arget_include_directories()

* removes #pragma once from .cpp file
2025-09-19 23:45:03 +08:00
Bastien Nocera
22d6e9de2b FIX: Fix missing wxBitmap{,Button} declaration
In file included from /run/build/BambuStudio/src/slic3r/GUI/FilamentGroupPopup.cpp:1:
/run/build/BambuStudio/src/slic3r/GUI/FilamentGroupPopup.hpp:60:17: error: ‘wxBitmapButton’ was not declared in this scope
   60 |     std::vector<wxBitmapButton*> radio_btns;
      |                 ^~~~~~~~~~~~~~
/run/build/BambuStudio/src/slic3r/GUI/FilamentGroupPopup.hpp:60:32: error: template argument 2 is invalid
/run/build/BambuStudio/src/slic3r/GUI/FilamentGroupPopup.hpp:65:14: error: field ‘checked_bmp’ has incomplete type ‘wxBitmap’
   65 |     wxBitmap checked_bmp;
      |              ^~~~~~~~~~~

(cherry picked from commit ab345221437f52606c54c76fd9837bd9dad98d1c)
2025-09-18 23:02:15 +08:00
Bastien Nocera
0cc427ec41 FIX: Fix missing wxTimerEvent declaration
In file included from /run/build/BambuStudio/src/slic3r/GUI/FilamentGroupPopup.cpp:1:
/run/build/BambuStudio/src/slic3r/GUI/FilamentGroupPopup.hpp:33:18: error: ‘wxTimerEvent’ has not been declared
   33 |     void OnTimer(wxTimerEvent &event);
      |                  ^~~~~~~~~~~~

(cherry picked from commit b890f0a39fcb48a1f1e1ee01f2aacf5d2fa35ad6)
2025-09-18 23:02:11 +08:00
Bastien Nocera
7ef078c94d fixup! FIX: Fix missing FilamentMapMode declaration
(cherry picked from commit 13624fb941bedd9afd130fe6209db93f2e4236a9)
2025-09-18 23:02:07 +08:00
Bastien Nocera
ce41091f28 FIX: Fix missing wxDisplay declaration
/run/build/BambuStudio/src/slic3r/GUI/WipeTowerDialog.cpp: In constructor ‘WipingDialog::WipingDialog(wxWindow*, const std::vector<std::vector<int>, std::allocator<std::vector<int> > >&, int)’:
/run/build/BambuStudio/src/slic3r/GUI/WipeTowerDialog.cpp:123: error: ‘wxDisplay’ was not declared in this scope; did you mean ‘wxGetDisplay’?
  123 |     double scale_factor = wxDisplay().GetScaleFactor();

(cherry picked from commit c6f2b0e950e607b24a74e797534e0aa7f6216d6f)
2025-09-18 23:02:03 +08:00
Bastien Nocera
56c5d370b4 FIX: Fix missing Slic3r::intersection declaration
/run/build/BambuStudio/src/slic3r/GUI/ImGuiWrapper.cpp: In static member function ‘static ImVec2 Slic3r::GUI::ImGuiWrapper::suggest_location(const ImVec2&, const Slic3r::Polygon&, const ImVec2&)’:
/run/build/BambuStudio/src/slic3r/GUI/ImGuiWrapper.cpp:2201: error: ‘intersection’ is not a member of ‘Slic3r’; did you mean ‘PrinterFunction’?
 2201 |         if (Slic3r::intersection(interest, Polygon(moved_polygon)).empty())

(cherry picked from commit de2b5b74cecda595d75fef894da4a92936e0cb7f)
2025-09-18 23:01:59 +08:00
Bastien Nocera
a856ebd5c2 FIX: Fix missing wxDialog declaration
In file included from /run/build/BambuStudio/src/slic3r/GUI/WipeTowerDialog.cpp:4:
/run/build/BambuStudio/src/slic3r/GUI/WipeTowerDialog.hpp:8:1: error: expected class-name before ‘{’ token
    8 | {
      | ^

(cherry picked from commit 989d9f36b5a495e2d9b2e3c76d849a3b79f49799)
2025-09-18 23:01:54 +08:00
Bastien Nocera
4d6e8a735a FIX: Fix missing wxAutoBufferedPaintDC declaration
/run/build/BambuStudio/src/slic3r/GUI/CapsuleButton.cpp: In member function ‘void Slic3r::GUI::CapsuleButton::OnPaint(wxPaintEvent&)’:
/run/build/BambuStudio/src/slic3r/GUI/CapsuleButton.cpp:63: error: ‘wxAutoBufferedPaintDC’ was not declared in this scope
   63 |     wxAutoBufferedPaintDC dc(this);
/run/build/BambuStudio/src/slic3r/GUI/FilamentMapPanel.cpp: In member function ‘void Slic3r::GUI::FilamentMapBtnPanel::OnPaint(wxPaintEvent&)’:
/run/build/BambuStudio/src/slic3r/GUI/FilamentMapPanel.cpp:182: error: ‘wxAutoBufferedPaintDC’ was not declared in this scope
  182 |     wxAutoBufferedPaintDC dc(this);

(cherry picked from commit 05d977b553c24338286d9b01d8888e46214216c6)
2025-09-18 23:01:51 +08:00
Bastien Nocera
ce9a0374d8 FIX: Fix missing wxGridSizer declaration
/run/build/BambuStudio/src/slic3r/GUI/DragDropPanel.hpp:36:5: error: ‘wxGridSizer’ does not name a type; did you mean ‘wxSizer’?
   36 |     wxGridSizer *m_grid_item_sizer;
      |     ^~~~~~~~~~~
      |     wxSizer

(cherry picked from commit 06a146e20cbc9642b3f65a5173ffbee3c052798c)
2025-09-18 23:01:47 +08:00
Bastien Nocera
1583b836a3 FIX: Fix missing FilamentMapMode declaration
/run/build/BambuStudio/src/slic3r/GUI/3DScene.hpp: At global scope:
/run/build/BambuStudio/src/slic3r/GUI/3DScene.hpp:65:5: error: ‘FilamentMapMode’ does not name a type
   65 |     FilamentMapMode         mode;
      |     ^~~~~~~~~~~~~~~

(cherry picked from commit eaec4c997eca8310e9037b70567dceed79dd210c)
2025-09-18 23:01:35 +08:00
Bastien Nocera
a0bde11b29 FIX: Fix missing std::set declaration
/run/build/BambuStudio/src/slic3r/GUI/Widgets/DropDown.cpp:281:10: error: ‘set’ is not a member of ‘std’
  281 |     std::set<wxString> groups;
      |          ^~~

(cherry picked from commit 842152b65a3584a9a59950f52260b20951dd09a5)
2025-09-18 23:01:04 +08:00
Noisyfox
178c6092b4 Merge remote-tracking branch 'upstream/main' into dev/h2d 2025-09-18 17:24:07 +08:00
zhou.xu
ef4bdac5c1 FIX:FIX:material item check parent name in mac
jira: STUDIO-11117
Change-Id: Icf155f04eb0e1fcc995d04c6f4646a6d729cb1cb
(cherry picked from commit d22a2e91e53c76bc40fdacc1ee5c7faff216711d)
2025-09-18 17:18:04 +08:00
tao wang
780d547727 ENH:not allowed to map to empty slots
jira:[STUDIO-9901]

Change-Id: I98e2ad72b957bd6c42f6baa765a181aebaf81f1a
(cherry picked from commit be912aa84ac930b81a52687a3f536e96af454ec1)
2025-09-18 17:17:55 +08:00
zhou.xu
a95a44844e ENH:modify text
jira: none
Change-Id: I7bb2bc5fa0a1a14afce822b67c3dd095c4bf6549
(cherry picked from commit f3f6032de9657c681806bbaee0ce5881938be368)
2025-09-18 17:16:07 +08:00
zhou.xu
8092512af1 ENH:When software is full screen in mac, the sub frame uses the wxSTAYBON_TOP style
jira: none
Change-Id: I338576d77e61a436615e70372b4564c38be0c7dc
(cherry picked from commit 645d843dd97949fb6a73e93fc61ffa4a255b20f3)
2025-09-18 17:16:00 +08:00
xin.zhang
5bae3838c5 FIX: remove the restriction
jira: [STUDIO-11094]
Change-Id: Ic13f07abaf5eda5d3077275d74071e5e342b2c77
(cherry picked from commit 319313fc2d72c8e442a6030b4317a9d47da5a182)
2025-09-18 17:15:10 +08:00
xun.zhang
6fc67a7cff ENH: do not display checkbox in filament map dialog
jira: NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: If2929fba4b7aeb9b69b296921c9d337a4e2d2330
(cherry picked from commit 7886a14b60ace2659de4e53b5bb186f4973f6e06)
2025-09-18 17:13:45 +08:00
xin.zhang
343003a3c9 FIX: move the ams mapping check
jira: [STUDIO-11094]
Change-Id: I1ef4bcaef406616d898f198cdf803213d47c5f68
(cherry picked from commit fd795f19163a1e310753ce6834672ce3b504d3c2)
2025-09-18 17:13:35 +08:00
zhimin.zeng
5ce2ec11a8 FIX: the data and UI are out of sync when creating printer
jira: STUDIO-11080
Change-Id: I4cc86174b4ed847b53c87f85f9e590742e6dd9ff
(cherry picked from commit c366876acfb95b16bedb57f9e22e1623fc749f7e)
2025-09-18 17:13:09 +08:00
mixian
c2c4fbe3a8 FIX: fix setFilament img offset issue
Jira: 111000
Change-Id: Ifd921ce62b5f469b97d00331f361edbe2ba8cf3c
(cherry picked from commit 9486b6df23851afd3d6f64313403825913484f18)
2025-09-18 17:09:01 +08:00
xin.zhang
890fe61af2 FIX: access the ext
jira: [STUDIO-10970]
Change-Id: I65889835a4ced2d0d3547cacc505d6e1d874497e
(cherry picked from commit 7bc1108a2ecd8f00ba057034e74f9d1b8eac135f)
2025-09-18 17:08:47 +08:00
xin.zhang
1aee0189d4 ENH: split the status
jira: [STUDIO-10949]
Change-Id: Ic93ae9d13dff2f5d72aef4e0f5a1250581224a18
(cherry picked from commit cc5b696d8dcf3838ac5324cdd11297e04ce1c8e6)
2025-09-18 17:08:22 +08:00
zhou.xu
13d3cfda63 ENH:Text not centered on mac15
jira: STUDIO-11056
Change-Id: I1c651421f8914a25707ad5b5c1d3e3d56c2df959
(cherry picked from commit 7af3eba50047c4b5f852f2ac3814243543a5019a)
2025-09-18 17:08:18 +08:00
tao wang
572a52ffad FIX:fixed the error in displaying ext steps
jira:[STUDIO-10998]

Change-Id: I1c1240f69c187c2d0de4887e51596fba8db68744
(cherry picked from commit 0a9e1c8899bb3bd1c5a7063d0fabf07572c4ee04)
2025-09-18 17:05:55 +08:00
tao wang
43006e278e ENH:adjust the order of print checks
jira:[STUDIO-10949]

Change-Id: I7013697384a2586c50e441f6bf9d15401fdf7bb5
(cherry picked from commit 2c0953a5540912f5c1fdae9ed9905cc1b1e2af45)
2025-09-18 17:05:51 +08:00
chunmao.guo
1e3a761ffe FIX: select base printer preset when deleting custom preset
Change-Id: If69a58d486fc7a98ae4a0242dd9d345e8d3cf940
Jira: STUDIO-11013
(cherry picked from commit f7ca47c2b3403412bde7da37a69bd56a5a13d1c0)
2025-09-18 17:05:30 +08:00
xin.zhang
6f09622180 FIX: move the flag
jira: [STUDIO-11069]
Change-Id: I856225577243cd58e3111c71915049828e72dc00
(cherry picked from commit 8f5205a34cf8f790f9e395ccd744baf15041f7fb)
2025-09-18 17:05:21 +08:00
xin.zhang
98c82d6be6 FIX: try optimize the material settings refreshing
jira: [STUDIO-11086]
Change-Id: I610304a7aa4a1b23e1e3fe7def157a93f5ae19af
(cherry picked from commit 6eff893be393ad73a74bb41414c0d1aab4d4c6f3)
2025-09-18 17:05:16 +08:00
zhou.xu
03526dfdd8 ENH:Unmapped text for unknown material follows dark mode
jira: STUDIO-11066
Change-Id: I39af33cb02a93067ff22c9ada7dff119571d2b66
(cherry picked from commit 9a6a6d1b39dae215f02d64610e61107c4cc12eeb)
2025-09-18 17:05:10 +08:00
zhimin.zeng
a9ea1992a0 FIX: crash when delete filament with setting support filament
jira: STUDIO-11063
Change-Id: I72ede85e540178b576239615d67017c082ded113
(cherry picked from commit bef139898a9d5f2245a7b0ae7b399c4cedcdc6a0)
2025-09-18 17:04:42 +08:00
xin.zhang
35b7435644 FIX: use smaller font
jira: [STUDIO-11043]
Change-Id: I4219bb6bda3b834c1b32ef205f287e0cccd94ed9
(cherry picked from commit be16678e7048dbc0c9d8a433e04d53823c8227c1)
2025-09-18 17:04:37 +08:00
xin.zhang
17288f7fe0 FIX: prevent the condition
jira: [STUDIO-10745] [STUDIO-11082]
Change-Id: I3b0ed2a58a4d873edf2bf92576ceaf2ecdb072d8
(cherry picked from commit 638585a4fcee5830fa7b02a51d7a12041ed64dad)
2025-09-18 17:04:33 +08:00
xin.zhang
55c8752509 FIX: raise the dialog
jira: [STUDIO-11075]
Change-Id: I661e7de97720a313619ce6fe436f15573cf0f7be
(cherry picked from commit af23446648bf88dcb61a02d9d48645c397cec116)
2025-09-18 17:04:27 +08:00
xin.zhang
e2c6f0b6b5 FIX: hide the notice if it's invalid
jira: [STUDIO-11073]
Change-Id: I30a9a5e5c4195caf734f4ac79aa7aff49e75924d
(cherry picked from commit 2d82a1170bf12acccdc40ab47d33b0b71bc07bab)
2025-09-18 17:04:23 +08:00
zhou.xu
87116c0f00 ENH:When software is full screen in mac, the sub frame uses the wxSTAYBON_TOP style
jira: STUDIO-11046
Change-Id: Ie1b85e4ac5a5698ec42870349f688924cdf30e21
(cherry picked from commit b28b9c49b208b4269563f59b42ac671fca8035be)
2025-09-18 17:04:10 +08:00
zhou.xu
dd6fff08f7 FIX:delete no use code
jira: STUDIO-11059
Change-Id: Ief3e45f4e6cc079c60161b9b9a55b2152013b70e
(cherry picked from commit ab26fb71a50c930c4c3945f91d275dbe78ea8c5c)
2025-09-18 17:01:19 +08:00