Commit graph

31 commits

Author SHA1 Message Date
Noisyfox
df734857cc
Merge branch 'main' into dev/p2s-pr 2025-11-08 20:46:30 +08:00
yw4z
b62187f076
Match UI of filament grouping & fixes (#11238)
* init

* update

* match radio icons

* fix background

* Show only on "summary" and "filament" tab

* delete unused icons
2025-11-08 20:44:37 +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
Noisyfox
56d8bd8fbe Fix option nullable 2025-10-10 16:57:16 +08:00
Noisyfox
a9c0490c68 Update color 2025-10-05 16:02:17 +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
xun.zhang
a86bbf6cb4 FIX: dark mode display in dialog
jira:STUDIO-10811

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I174541d97efe8d0beea4913d23375f82b104b7a2
(cherry picked from commit 7bcc83682e314ea12c5c5229f394015d61cff345)
2025-09-18 11:05:52 +08:00
Mack
3dd369ad4e ENH:FilamentMapDialog add filament type
jira: nojira
Change-Id: I08a3c037ffa6227602e71b97697a1bc61e3d5050
(cherry picked from commit 6621fd0e20bce4c32788a86a6fde018f3a7f41ef)
2025-09-17 14:35:02 +08:00
xun.zhang
acbea85829 FIX: add some missing translate keys
1. Add missing translation keys
2. Fix filament map dialog can't display in auto mode

JIRA:STUDIO-10216

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I0c3927877dd91befc2463a300324bc6823615673
(cherry picked from commit 3733f33953fa89b490be0d2f36e225fa62dcbc00)
2025-09-17 10:21:15 +08:00
xun.zhang
1384226447 ENH: refine logic with filament group
1. In slice plate mode,force use plate mode
2. In slice all mode, force use global mode

jira:STUDIO-10390

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I3edb559043fdc52339b7f611643b8f5ac116571d
(cherry picked from commit f042c817a7ed21b4b18915e2a649aed733a80f48)
2025-09-17 09:45:59 +08:00
xun.zhang
0b01388f49 ENH: jump to filament map dialog in error tip
1. Remove error tip for unprintable areas if no longer needed
2. Add link for filament map dialog in error tip

jira:STUDIO-10073

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Ic3235038de73a85964c6dbcb9b4f435e7aa47d34
(cherry picked from commit 1793060e96cec973d9606bd4fbe36686671e0fee)
2025-09-16 14:48:16 +08:00
zhou.xu
8c06b19a7b ENH:translate text
jira:none
Change-Id: I2d37d7ba4867b1507d2a8073dfdfc836b7c8e112
(cherry picked from commit 5427e9e0522b370e85ef0b2eab8394ae5f41ed40)
2025-09-10 16:31:39 +08:00
xun.zhang
c605f73d80 ENH: update translation
jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I9b260cb3e21b9052c9a2d65378bd0e795f6db6f3
(cherry picked from commit 2507eba37d5f09cca51b3e9f9f281b2208e57eb1)
2025-09-10 15:02:23 +08:00
xun.zhang
fc09eb2138 ENH: temperoraily disable map dialog after slice
jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I6d3d90db3508642e0e56015296d3efd50248bd05
(cherry picked from commit 3ddc30a60a36c531b004b7bacc0c583f9d6add3d)
2025-09-09 17:17:07 +08:00
xun.zhang
9732c0b845 ENH: some tip logic optimize
1. Only check printablily if have explicit filament map
2. Refine some sentences

jira:STUDIO-9753,STUDIO-9727

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I2fc3aa2276dc6f514c50ac2fcaf9509f41e778f3
(cherry picked from commit 73f92d27dab667c8893ab96e47f3832ce9d2de60)
2025-09-09 17:16:41 +08:00
xun.zhang
19b466ccf0 ENH: add global map mode tag for pop up
1. Add tag to mark the global map mode
2. Fix some wrong usage of bmp in code
3. Fix display error in dark mode

jira:STUDIO-9729

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Idb36a5022c403e02c26d7fe23a95dd6877deca90
(cherry picked from commit 5a2abf7e211327cde57717b5ab7b79b63c967bbd)
2025-09-09 15:40:26 +08:00
Noisyfox
950bb297f9 Fix compile error 2025-09-09 11:19:39 +08:00
xun.zhang
897a78ce9a ENH: refine the logic of filament map dialog
1. Always change the map and mode in plate if plate mode is not default
2. Always add pop up before slice
3. Fix the mapping issue in gcode viewer

jira: studio-9523,studio-9519,studio-9513,studio-9479

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I0d7d5daf081951ea2d49e06565762ac24064e77c
(cherry picked from commit afaa48520e16b6808f05e511ac1cfe91acadc84b)
2025-09-09 11:03:56 +08:00
xun.zhang
347cd4aadd ENH: refine some ui logics with filament map
1. Optimize performance with pop up
2. Optimize display in dark mode

jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Ic0f72a42e791fb58b84e7a88d7a34ced3a9e8c38
(cherry picked from commit 481ebc4a4b9353d8c9ef9d6bf64cb0006364e839)
2025-09-07 00:46:58 +08:00
xun.zhang
a91937a7f8 ENH: modify some sentences for translate
jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I6ba3de47566c73ee8d6f8f5f24c854b9599dc073
(cherry picked from commit f858d6c7a8509d3b798bca40cb07eb63ab6efcc0)
2025-09-06 23:53:37 +08:00
xun.zhang
b2e587ce47 FIX: fail to translate in filamnet group pop up
1. Initilize the sentences in construct function
2. Fix some ui bugs

jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I991df343932bb60d5ba86f41f641661f2159da47
(cherry picked from commit 05383187e02cc0dec6a541859d44237a63d01820)
2025-09-06 23:53:29 +08:00
xun.zhang
a378afde0b FIX: unable to select filament map mode in macos
1. add wxPU_CONTAINS_CONTROLS when construct
2. fix some ui bugs

jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I413dbaa35f3f79c97e2db3f8b2cdb5ab55739484
(cherry picked from commit cd23329267a1d2c9d28098d73bc007ce4fd58eb2)
2025-09-06 23:53:01 +08:00
xun.zhang
057a1a4f5d ENH: refine ui logic with filament group
1. Add filament group pop up when slice
2. Add more filament modes in filament dialog
3. Add capsule button

jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I8bc3a2e08696e406b89e550a0335a1a36728ee65
(cherry picked from commit f1702a5c3604f685a3b35ea0e83d29bdbbd90f70)
2025-09-06 23:52:20 +08:00
zhimin.zeng
679a4a7fa3 FIX: Inconsistent filament map box width at other resolutions
jira: none
Change-Id: Ib8d8478848252264ba43ad9a9091403f92d8314e
(cherry picked from commit 2a75d397c4ca523c61b51e0853bad8f9e0f7d7c4)
2025-08-24 23:18:22 +08:00
zhimin.zeng
5d17c51aa9 FIX: add set to Optimal button
2. modify the manual mode of filament_dialog
jira: none
Change-Id: I2ce6834eb65de2da70e7649346fc88b90f280b29

Change-Id: I18448e800fe3338f045d35f7a1fa6c3e3c8eef79
(cherry picked from commit 5dce0ebc06f6aace50374fa37bd91cabb5213385)
2025-08-24 23:18:22 +08:00
liz.li
0b71026bed ENH: add filament arrangement drag image and other UI details
jira: new

Change-Id: I2ebbfd2a20c2d2f6059c2508467cd69dd272f943
(cherry picked from commit 3e633455def0a40f9f041320c7cd3cc4ae65be02)
2025-08-24 23:18:22 +08:00
zhimin.zeng
1bcc4614b8 FIX: modify UI of FilamentMapDialog
1. Modify dragging behavior
2. The swap button is grayed out in automatic mode
jira:none

Change-Id: Idff795bf092c4959c67d0711b0be316fba997684
(cherry picked from commit c7486e1c5e56667cab61ee9a97898f03b65b64b8)
2025-08-24 23:18:18 +08:00
zhimin.zeng
7c6edc004f ENH: modify the UI of filament map dialog
jira: none
Change-Id: I513a518de4509fb7adbc81d9fc3b0fc43fb3244a
(cherry picked from commit 631baa3999ece2540c66cbf1488c55b64cadaf8e)
2025-08-24 23:18:17 +08:00
zhimin.zeng
1ada437979 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
zhimin.zeng
366701958c FIX: only display used filament on filament dialog
jira: none
Change-Id: Id643d1efad26eb2719f873543c2e451fe59dc5bb
(cherry picked from commit 1d4ce2bad5c4878f75208486d5862009154fc7ff)
2025-08-24 23:18:08 +08:00
zhimin.zeng
c34eb170f1 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