Commit Graph

172 Commits

Author SHA1 Message Date
b166c84f93 ENH:update svg for dual extruder machine
jira: STUDIO-9136
Change-Id: I35d48a27bf204b8d96a663d54d53ff2c3bf61cd6
(cherry picked from commit 46ec48445c9a17efb697b1337299be7bcab76674)
(cherry picked from commit 203fdf4cb35d424c5dbe6469f37b7bbd8cbc3c49)
2025-09-05 17:44:27 +08:00
671dfa5f0c ENH: buildvolume: add logic to support extruder_printable_height
jira: no-jira
Change-Id: I962c4aed8c536c0fd8b89ae090cd0463c5d645db
(cherry picked from commit 43773d77010492453473797e77e83e9a4630c25f)
2025-08-24 23:18:30 +08:00
402baf25f8 ENH:add layer_filament_list.json record used filaments for each layer
jira: none
Change-Id: Ib293ff9fdd284fef9e6de93260e2ba7cc3d66daa
(cherry picked from commit 28046fbc23e174868f41535764076888a680d116)
2025-08-24 23:18:25 +08:00
5e3cb89729 ENH: add tpu check before slicing
jira: none
Change-Id: I7d4f053e67f4a4aa22ef990d597d28cb894c4195
(cherry picked from commit 60cdf3b6551a8c18c10db0a746e1b15b764eda66)
2025-08-24 23:18:25 +08:00
d338ddfc40 ENH:add calc_extruder_only_area api
jira: none
Change-Id: Ic49348915bce53e9cd63effb5053a93a40840e04
(cherry picked from commit 647467e25b83588bfde25429e64320cb42c1ac99)
2025-08-24 23:18:24 +08:00
437f17d30d FIX: get nozzle_diameter error
jira: none
Change-Id: Ic33854a0d7322fe9154910480d2ea3ceae524f79
(cherry picked from commit 12912f6772b3c11d5df658be1fc8c17ccb5565cc)
2025-08-24 23:18:23 +08:00
e6b4361146 FIX:reset is_load_extruder_only_area_textures flag
when change machine
jira:none

Change-Id: I97c97fae3d4ded0e25d518c0ae4a5cef9c640b45
(cherry picked from commit c26521470fb7a35b09a67559d8ec3facf2b3988a)
2025-08-24 23:18:22 +08:00
391c6c05dc FIX: modify unprintable_filament_ids should regroup
jira: none
Change-Id: Ifb8105f6e301aaed9ca4e62a37b9d3a1616e755b
(cherry picked from commit fec7129437fc781b918ae1819c280440ea3fb54b)
2025-08-24 23:18:16 +08:00
8db4ddf040 ENH: Add limited filament maps to slice info
jira: none
Change-Id: I7b08943ba5f4e7fa9be18ba3f64caee182888d45
(cherry picked from commit 85ebb469959499d5c2d7fe349e0d8e92045c9fab)
2025-08-24 23:18:16 +08:00
e8420e93d3 ENH: Add gcode check for multi_extruder
jira: none
Change-Id: Iebc43e608c4509eb62b280af2d401fa9e0e089ba
(cherry picked from commit c75c10e312b8d0bd5404d92db88c95a9e6186bc1)
2025-08-24 23:18:14 +08:00
f735227801 Fix build error 2025-08-24 23:18:13 +08:00
8069133261 ENH: dual_extruder: add logic to process extruder_printable_area
JIRA: STUDIO-7498
Change-Id: I1cf53db93acf41b06cb1b9569a0679487c9f1e41
(cherry picked from commit e5be69dedd1ba6dc289a14b89598c9a6101dacb3)
2025-08-24 23:18:12 +08:00
58226a65e0 FIX: enhance filament_map auto manual behavior
1. auto mode dragdrop is not allowed
2. not display filament_map when there is no result in auto mode

jira:none

Change-Id: I0800e0d832e27fe459a17bb1aa829b5e72d0ee8f
(cherry picked from commit 9ee85bef34aaabe7a4cef251f07e77f9af693a2f)
2025-08-24 23:18:11 +08:00
8f6397a4b1 FIX: only single extruder printer display the icon
of FilamentSettingDialog
jira: 7714

Change-Id: I5d6eca802b9be1fcdeaa28d9e4fbc4862d8c8378
(cherry picked from commit b7176bfdd14c88362058d374c8573d1bb22d6a03)
2025-08-24 23:18:10 +08:00
18c64b9e82 NEW: Add FilamentMapDialog
support drag drop to modify the filament map
jira: none

Change-Id: I0ed3180a0fa8e95e7c871bb039eb844faccd1344
(cherry picked from commit 67f67d76889668fdd80ae5e496b6cbca5f771a43)
2025-08-24 23:18:07 +08:00
8ab31f01ad FIX: update filament map of plate when switching preset
that has different nozzle nums
jira:none

Change-Id: If78571ddf4fa7ac17e7dcf47013075821b8567a6
(cherry picked from commit a6ad5c8be86313085922e3063eec2aba029a5a99)
2025-08-24 23:18:06 +08:00
559e6c4437 FIX: save filament_maps to slice_info
and fix bug when switching printer preset between single-nozzle and double-nozzle, prompt the modification of extruder_count
jira:none

Change-Id: I1d5f0b2f002493378d2f482d08cfd5a72b35b99f
(cherry picked from commit ed9816397374116db37c2a76d11e0216df5aca1d)
2025-08-24 23:18:06 +08:00
b5d92e9159 FIX: fix build error
jira: none
Change-Id: I97df69b728fc3871b7c33e1fd3ba068e741d51c7
(cherry picked from commit 326d7d28b47017bdbd98873a6437ef84116291ba)
2025-08-24 23:18:05 +08:00
35a94e37cb ENH: config: add filament_maps in partplate
Change-Id: I1183830788e703f1d33a8a4b620b58b822283dd4
(cherry picked from commit b0e3ab037e3f5af0851539af5ac15b8f96daf548)
2025-08-24 23:18:01 +08:00
52e1f4259b ENH: support delete any filament id
Change-Id: I71bcd54985b3f9e19a19d04327d00b402ec22380
(cherry picked from commit f3d67a98ac770e6f045a76bed4531139763b33cf)
2025-08-24 23:18:01 +08:00
89cdbeb489 NEW:add "extruder_only_area" textures for
double extruder machine
jira:none

Change-Id: Iaf4118fb00641537838dae7cc5fdaaf07ccc9851
(cherry picked from commit a8d6c9fe8976dbcb79c1f89efb7107073cb17856)
(cherry picked from commit c74a769c14d702dbb78d479e49be927028502037)
2025-08-24 23:17:59 +08:00
617a512a4d Fix: Reset object settings not working for plate's Skirt Start Angle and Other Layers Sequence (#10482)
* init
2025-08-23 23:19:00 +08:00
de66749a11 fixes compiler warnings (#9619)
* compiler warnings: adds SYSTEM to [target_]include_directories to skip warnings originating from dependencies

* compiler warnings: uninitialized/unused variables, missing parenthesis, pragma

* compiler warnings: redundant template type, missing curly braces, pass 0 instead of NULL as int argument

* compiler warnings: removes fclose(fp) where fp==nullptr since fclose() has attribute __nonnull((1))

* compiler warnings: uninitialized variables, missing parentheses, missing curly braces

* compiler warnings: ? as lower precedence than <<

* compiler warnings: unused variable

* compiler warnings: unused result

* compiler warnings: undefined/unused variable

* compiler warnings: uninitialized variable
2025-06-14 21:05:25 +08:00
2048a22161 Improve quality of bed name / number texture (#9535)
* init

* update

* update

* update

* update

* update

* Update PartPlate.cpp
2025-05-08 12:33:57 +08:00
bdfc873d15 Fix: 2Dbed step calculation for grid not working (#9550)
init
2025-05-05 17:59:00 +08:00
00de73d9ee Fix exclusion area shape and color (#8792)
* Update PartPlate.cpp
2025-05-04 23:12:04 +08:00
68c193f0e0 2D Bed (Bed shape dialog) improvements (#9524)
* init

* fix grid & text colors for light theme

* scale axis

* fix custom bed plate not appearing

* merge functions for generating gridlines

* simplify

* Fix flatpak build

---------

Co-authored-by: Noisyfox <timemanager.rick@gmail.com>
2025-05-04 16:38:38 +08:00
c6f5e2e243 Ensure bed shape is in correct orientation (#9350)
Fix #9345

This also fixes deltamaker's plate logo rendering:
![image](https://github.com/user-attachments/assets/517c9b3c-8eee-4081-a2bc-5913fe35328b)

And fix bed rendering issue for custom shaped bed without model:
![image](https://github.com/user-attachments/assets/9643413e-9b1c-4e74-afe8-edf2306e7021)


Also fix rendering of exclusion area that are defined in clockwise:
![image](https://github.com/user-attachments/assets/0949c1c3-6304-4ece-85c7-f3162249bf90)
2025-05-01 17:28:10 +08:00
4f38ef7557 Fix: Grid size calculation wrong on large scale (#9500)
* Update PartPlate.cpp

* Update PartPlate.cpp

* add descriptions

* simplify calculations
2025-04-28 15:17:47 +08:00
179553a1b5 Make sure exclusion area is correctly rendered even in wrong orientation 2025-04-26 12:38:13 +08:00
62f22601e5 Merge branch 'main' into bugfox/bed-shape-orientation 2025-04-20 18:21:31 +08:00
f5f388fcc6 Fix: Alignment issues for default shapes / gridlines of bed plates (#9360)
* Update PartPlate.cpp

* Update 3DBed.cpp

* Update 3DBed.cpp

* update

* Update PartPlate.cpp

* Update 3DBed.cpp

* Update PartPlate.cpp

* Update PartPlate.cpp

* Update PartPlate.cpp
2025-04-20 18:20:25 +08:00
697fa4d3cb Ensure bed shape is in correct orientation (SoftFever/OrcaSlicer#9345) 2025-04-15 12:51:01 +08:00
583ae0b3bf Fix grid lines not aligned to origin (#8767)
* fix

* Update PartPlate.cpp

* fix typo
2025-04-13 23:02:01 +08:00
279f650ff6 Improvements for Sliced Plates Toolbar (#9313)
* initial

* fix scaling related issues

* Update GLCanvas3D.cpp

* update

* Update GLCanvas3D.cpp

* Update GLCanvas3D.cpp

* Update GLCanvas3D.cpp

* Update GLCanvas3D.cpp

* Update GLCanvas3D.cpp

* update

* Update GLCanvas3D.cpp

* Update GLCanvas3D.cpp

---------

Co-authored-by: Noisyfox <timemanager.rick@gmail.com>
2025-04-13 14:57:08 +08:00
f5d6891a17 Fix: Bed icons not vertically centered on circular shaped plates (#9321)
* Update PartPlate.cpp

* simplify changes
2025-04-13 13:34:17 +08:00
34abf60403 Only consider part above plate when checking for object outside (#8456)
Fix #8218

Before:
![image](https://github.com/user-attachments/assets/3fa8bcb0-b0df-4503-b2f7-0ecba99fafab)


After:
![image](https://github.com/user-attachments/assets/f7280b50-42be-4ef1-a53e-12408511a627)
![image](https://github.com/user-attachments/assets/65ffebb7-6d49-4d8a-9dda-4676e4b0953b)


Note: there is still an issue that you still cannot slice if object below plate overlaps exclusion area. It won't be easy to fix and also will be computational costy, so I won't try to solve this in this PR yet.
![image](https://github.com/user-attachments/assets/76cb2f65-6233-47e7-85fe-fd92dd1d2507)
2025-03-30 15:40:44 +08:00
ea253b5e3d Scale bed icons & text depends on bed size (#8621)
* Update PartPlate.cpp

* Update PartPlate.cpp

* Merge branch 'main' into saclin-build-plate
2025-03-01 13:55:39 +08:00
07a09a0a5f Handle sinking object properly 2025-02-19 18:02:39 +08:00
b1ab3dd80b Initial port of Brim ear gizmo
Cherry-picked from bambulab/BambuStudio@92c85a13d0

Co-authored-by: Mack <yongfang.bian@bambulab.com>
2025-02-17 11:19:07 +08:00
88e652d8c2 Fix random crash when opening 3mf files that have bed size different than current (#7955)
* Fix bed raycast id

* Fix bed raycaster UAF crash due to bed resizing
2025-01-22 09:58:15 +08:00
5df5cc1549 [feature] Add Bambu Cool Plate SuperTack (#7670)
* ENH: add supertrack plate

Jira: none

Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I89017c9933597ee035aa20ba3852db6f629f5e20
(cherry picked from commit 78572cbff864e5e78255f2e0eb6e40237bc0bab9)

* NEW:add SuperTack svg

jira: none
Change-Id: Id6153f76f8634d1f00485991b75cbe526fb64adc
(cherry picked from commit 6404f06e79d38ffa8f7f296b10af2af1c2a3974d)

---------

Co-authored-by: zhou.xu <zhou.xu@bambulab.com>
2024-12-14 14:16:24 +08:00
4ed8bce8eb making all four corners of the grid sharp instead of round 2024-10-02 15:37:49 -07:00
81b6a810f6 Fix and update locale 2024-09-25 19:58:26 +08:00
Azi
881d78a045 Feature/move plate to the front (#6262)
* WIP:only works after saving and then reloading

* working version of move plate to the front

* added icons for move to front

* removed a commented line

* fixed the move to front function to behave correctly with undo/redo actions

* Merge branch 'main' into feature/move_plate_to_the_front
2024-09-25 19:27:45 +08:00
24106e39e7 Add support for textured cool plate (#6860)
support textured cool plate
2024-09-22 16:48:49 +08:00
b917832db6 Duplicate Current Plate With Objects (Second PR) (#6710)
* Added `duplicate plate` feature.

This the initial commit and this still needs work.

* [#2025] Fixed the SEGFAULT, apparently an icon id=6 needed to be updated to id=7 as we have one more plate icon.
[#2025] Removed the `printf` statements.

* [#2025] Plate duplication is now fully implemented.

* [#2025] Updated icons for plate duplicate funcctionality.

* [#2025] Added toolbar icon fro "Duplicate Current Plate" action.

* [#2025] Revert changes for `toolbar_add_plate_dark.svg`.

* [#2025] Removed the `BBS` label in the code that is not written by BBS.

* [#2025] Updated `.gitignore` to ignore VSCode workspace file.

* [#2025] Fixed the instances not transforming in global space when the plate is duplicated.

* [#2025] Removed the Duplicate Plate action from the plate actions and the toolbar.

* [#2025] Added the `Duplicate Current Plate` functionality to the `Edit` menu.

* [#2025] Addressed review comments.

* [#2025] Addressed review comments.

* [#2025] Removed unused icons related to the previously introduced "Duplicate Plate" functionality.
2024-09-10 23:43:41 +08:00
a4a8ef0913 Fix crash in printer config when switching tabs (#6537)
* Fix ASAN with MSVC

* Make ASAN happy

* Avoid deleting activated tab button by not calling `DeleteAllItems` (#SoftFever/OrcaSlicer#6486)
2024-08-23 22:55:10 +08:00
491f360dfd Reduce warnings: remove unused variables (#6499)
Removed unused variables
2024-08-23 00:02:58 +08:00
ab3d04312b 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