Commit Graph

187 Commits

Author SHA1 Message Date
Rodrigo Faselli
41a2c85bff Line type by default for single extruder single material (#11397)
* line type by default single extruder

* Defautl to color print if use multicolor

* Update condition for setting view type in GCodeViewer

* Refine default view type selection in GCodeViewer

Improves logic for selecting the default view type based on nozzle and filament preset counts. Now selects 'Summary' for multiple nozzles, 'ColorPrint' for single nozzle with multiple filaments, and 'FeatureType' otherwise.

* Refactor multimaterial detection in GCodeViewer

Introduced a 'multimaterial' boolean to clarify logic for detecting multiple filament presets. This improves readability and maintains consistent behavior when setting the view type based on extruder and filament count.
2025-12-18 16:55:19 +00:00
Alexandre Folle de Menezes
a0d4a9829e Standard units need translation for CIS Languages (#11376)
* Standard units need translation for CIS Languages
2025-11-17 10:29:44 +08:00
yw4z
e761166a8a 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
Noisyfox
4fef1ac1ca Fix issues with non-bbl multi-head printers 2025-10-19 22:54:48 +08:00
Noisyfox
cc7d2bd136 Merge branch 'main' into dev/h2d 2025-10-18 19:20:09 +08:00
Noisyfox
62c8ca0e06 Fix several imgui UTF8 related issues (#11078)
* FIX:add  tooltip(const std::string &label, float wrap_width) api

jira: none
Change-Id: I2372f57177a362f540e509747552a4a27f23fe8f
(cherry picked from commit 9d690cddd60245cd3c16498e6c83183ec8446241)

* Fix crash when rendering text icons

---------

Co-authored-by: zhou.xu <zhou.xu@bambulab.com>
2025-10-18 19:17:50 +08:00
Noisyfox
a9d4dfea36 Update gcode legend window to match orca style, also make it more space efficient 2025-10-11 10:27:12 +08:00
Noisyfox
05aedd6d92 Update color 2025-10-05 16:02:17 +08:00
songwei.li
bea6cbd255 FIX: the exported Gcode file is stuck when imported on Mac
suppressed_backround_processing_update when loading gcode to prevent deadlock.

jira: STUDIO-13899
Change-Id: Iad4f20cd5249bb5133146197bb1bc32101b08bdf
(cherry picked from commit 2579cdc7adb98c1f21c3169a9fcebba60597fb43)
(cherry picked from commit 13b14414e03e3907d9d1662cdab570c754200618)
2025-10-05 00:09:09 +08:00
zhou.xu
666b38f78a FIX:Add array out of bounds protection
jira: none
Change-Id: I038e45be00664ab35dfbc2d59ddfa6c018cd2873
(cherry picked from commit d4967c8c269d0f9b918e9049addcd7d6f6fd2656)
2025-10-03 22:27:04 +08:00
shan.chang
5cacd34a5c ENH: add new arrangement features for wrapping detection area
Jira: STUDIO-13735

Change-Id: I198d19f5e6ef70f0adfa6370269290c81d21a557
(cherry picked from commit dc83637652526111611d0833d5f5798aaa3e7be7)
2025-10-02 17:41:41 +08:00
songwei.li
29d6feca23 FIX: Slicing Result Color Mapping Makes No Sense
The extreme extrusion in the H2D first layer's start code caused the color range in the preview to be too large. Add a constraint to eliminate the effect of this start extrusion.

jira: STUDIO-13830
Change-Id: Ifccbd14449d1c424f0bb3c1e3d254bddffa41a7c
(cherry picked from commit 6b935a9de0f9fe98f041f509ab6d2d72b59e957b)
2025-10-02 17:07:20 +08:00
xun.zhang
ede425d4c9 FIX: wrong desp for color scheme
jira: STUDIO-11215

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Iaf78c825cbc99a43c4614e20ea9fdc683cf11784
(cherry picked from commit aca4968ab779bbbbe148ca520bc0819bd92f0c03)
2025-09-21 13:48:04 +08:00
xun.zhang
293e4cbcda ENH: default turn to color scheme
github: 6299

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I4ec38a63110cab4560034948e75c2ced45ed1f5a
(cherry picked from commit 3eac767b14bc0d7652cc9fd157ee1e0d8672d38c)
2025-09-21 13:48:02 +08:00
jun.zhang
3b45dadda7 FIX: gcode viewer: always update top_layer_endpoints if top_layer_only is enabled
jira: STUDIO-11141

Change-Id: I1c8eb3234401ee64576212a08764170577855a8c
(cherry picked from commit 2c718bb376c4d26249f1942e9f076bf6e99d9f23)
2025-09-21 13:47:50 +08:00
xun.zhang
b694149dfc FIX: dark mode in filament group pop up
1.Also modify some tips

jira: NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I4e2abfe24afdf7f0d728a486aa248b8e5accbdf4
(cherry picked from commit 98dad923f8ee3001add10837a9b0a6c1507b47e0)
2025-09-18 14:33:04 +08:00
xun.zhang
2d2a166040 FIX: negtive value in grouping stats
jira:STUDIO-10772

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I90b88c7d96f6aeb31df36233efab5b9059ad2622
(cherry picked from commit f6a46d9b95aca66e49c89485424637b5eeae35ec)
2025-09-18 11:29:42 +08:00
Mack
43a8194f26 Fix:fix filament arrange ui
jira: nojira
Change-Id: I543c212d8e28f2701f8494f031c24090d9fe7617
(cherry picked from commit dcfc5af245d1cc27dfc8e1519dd3dfcbb2864af3)
2025-09-17 15:10:47 +08:00
Mack
fc64cc8451 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
e5f828da0b ENH: initialize nozzle num in gcodeviewer
jira:none

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I44827eb7adb457823b3da1d6b45a6003864294b6
(cherry picked from commit 129134f6df3fbad88d3b83a901b665da5c66f5c3)
2025-09-17 12:12:56 +08:00
xun.zhang
7119070eb1 FIX: support filament display in group result
1. Add "Sup." prefix for support filament
2. Align the filament group elems

jira:STUDIO-10263

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Idd6d11d14cd378142dff03596eea5efb47dde79f
(cherry picked from commit 038df3180a5b79cde7980b0f3cdecb4bbfffc820)
2025-09-16 22:08:07 +08:00
zhou.xu
d5d157a897 FIX:fix crash for no valid filaments
jira: none
Change-Id: I9433da99d2ad355f088917e88350c5fd36bd1aea
(cherry picked from commit 52442fa6d58d4d9204c386ec1a2ccfedf7115151)
2025-09-16 15:55:01 +08:00
Noisyfox
3f2dad133f Merge remote-tracking branch 'upstream/main' into dev/h2d
# Conflicts:
#	resources/profiles/BBL.json
#	src/slic3r/GUI/AmsMappingPopup.cpp
#	src/slic3r/GUI/MediaFilePanel.cpp
#	src/slic3r/GUI/Plater.cpp
#	src/slic3r/GUI/StatusPanel.cpp
2025-09-16 14:46:40 +08:00
xun.zhang
db99e4e704 ENH: add tip link for filament group in viewer
1.Also update wiki

jira:STUDIO-9944

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Iaa282054da40b6936dc6c741fe7ef7ca62f868f2
(cherry picked from commit caa51852afcaa207d4204b420612524cb0f7017a)
2025-09-10 16:55:08 +08:00
xun.zhang
e897834c88 ENH: refine logic in filament group in gcodeviewer
jira: NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Id89daec05f2d4017d326c6473bd62008dd9f0b11
(cherry picked from commit 2e26c5812a98e47a25d97e7f574e8a4d8e8f7f9e)
2025-09-10 16:29:49 +08:00
xun.zhang
94c0b125e0 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
828ca927d0 ENH: seperate statitics for auto for flush mode
1.Compare stats of AutoForFlush with other filament map modes
2.Refine the function signature of filament group

jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Iec2aff069d8c44343df8b82f045c61354c7d1c2a
(cherry picked from commit 95e49986f32070756182a31843f4f37f863f07ac)
2025-09-06 23:52:55 +08:00
xun.zhang
a7e70cd30e 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
xun.zhang
f5a8c96924 ENH: filament map params switch to global param
1.Add more filament map modes
2.Filament map and mode are set as project config
3.Plate filament map is only valid when plate filament mode is
manual

jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I33b2f853e0b77b9d605be1f2f1172b44df43da15
(cherry picked from commit e45f8c6dc2146e1e31a1c21e8aaada540af112d0)
2025-09-06 23:49:11 +08:00
Mack
ffa85aa3a0 ENH:Optimize the gcode viewer and STEP mesh UI
jira: nojira
Change-Id: Ie8d4f1eace04b2c51d4975c67b9a4deb7d88a56f
(cherry picked from commit b9aa0397600ab0f5040ac719277c7b16b1371435)
2025-09-06 23:08:56 +08:00
yw4z
f7ea05a2c4 gCode Legend Fixes / Improvements (#10501)
* Update GCodeViewer.cpp

* Update GCodeViewer.cpp

* Update GCodeViewer.cpp

* Update GCodeViewer.cpp

* Update GCodeViewer.cpp

* Update GCodeViewer.cpp

* Update GCodeViewer.cpp

* Update GCodeViewer.cpp

* Update GCodeViewer.cpp

---------

Co-authored-by: SoftFever <softfeverever@gmail.com>
2025-09-04 00:00:26 +08:00
Mack
0fdc17d99d FIX:The color scheme selection has been reset.
jira: nojira
Change-Id: I8bf7a8db4e40315b68e610008c865c319ba70172
(cherry picked from commit 5ae194be77187ba349389dc3726cacbcf89dea9c)
2025-08-28 14:10:57 +08:00
lane.wei
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
zhimin.zeng
ccbd4c9242 ENH: Add automatic slicing behavior for some steps
jira: none
Change-Id: If94726eee45724985b3b49b36695086da24f7848
(cherry picked from commit 0476a83264660841c5601168ab6f11a9c70411ff)
2025-08-24 23:18:29 +08:00
Mack
80226a8d20 ENH:colour arrangement ui text width limit
jira: nojira
Change-Id: I6a8f4341e671aa88704346bfeb1d8be3725619a1
(cherry picked from commit 3cb36b51119ef4468febeab9246e103226c42a07)
2025-08-24 23:18:23 +08:00
zhimin.zeng
fcc7e76a30 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
Mack
d9041eaa36 FIX:loss is_auto
jira: nojira
Change-Id: I3511b0abdbdb94b9517a1b21c95ce224d0f7422d
(cherry picked from commit c4cdc2e8f3960a9128ab7a8a7a62717351bcdbbc)
2025-08-24 23:18:22 +08:00
Mack
63614299d5 ENH:change Color Arrangement ui
jira: nojira
Change-Id: I77f84675da0b4fe7069c76c14668026fc3d8932a
(cherry picked from commit 785b8c7b2f5ee014fedea57a88693888d2b8ca26)
2025-08-24 23:18:20 +08:00
Mack
ae6f929ff6 ENH: color arrangement ui
jira: STUDIO-8124
Change-Id: Ibcde0e002ffd652b350bd05a9453ce7aaefd7bca
(cherry picked from commit 65e3829f92ceb0bd2152ff255640453a8216cc0c)
2025-08-24 23:18:18 +08:00
zhimin.zeng
af59fba6d8 FIX: fix ui display problem
jira: STUDIO-8143 STUDIO-8142
Change-Id: I50abb78f9585378d3ef7278377dfb35d5db6189d
(cherry picked from commit 00a6e17c6c21e741f8427f6841047fe49e6330cf)
2025-08-24 23:18:16 +08:00
qing.zhang
31767cd80f ENH: check wethether filaments print on first layer
Jira: none

Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I1cc7cd9e9bbbcdf72112c0949196c09ef414cf91
(cherry picked from commit 67039a6f4d51482fe689a2aad0a900f3339a5c62)
2025-08-24 23:18:14 +08:00
zhimin.zeng
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
lane.wei
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
zhimin.zeng
a41b1eae9f FIX: single printer should not display summary item for default
jira: 7948
Change-Id: I9d13ebe8e52eb46e1ef9f7bd62f814bc7837dbe6
(cherry picked from commit aba72bb04f9decd5ca02400626aeadfab35b243e)
2025-08-24 23:18:12 +08:00
zhimin.zeng
dfdf1d6ffb ENH: add summary for gcode preview
jira: none
Change-Id: I481536e0d950ebe695236e55ffca8113a26d8033
(cherry picked from commit 1040f007b658c0a34e0cef5a677373829c1b81b4)
2025-08-24 23:18:11 +08:00
Mack
aea9d3a972 FIX: load_from_svg_file_change_color() supports 8bit colour values
JIRA: nojira
Change-Id: I72e68bd9cb547064736d130205074da0e7eabd60
(cherry picked from commit 8bdac292a0bd34786189f4ca320f646340157d2c)
2025-08-24 23:18:10 +08:00
xun.zhang
15637de5b7 ENH: save multi extruder state in gcode processor
1.Save multi extruder state in gcode processor
2.Add machine exturder change time
3.Fix some naming issues

jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I9785331290515eeb908ff0ff01aad5aac44212d9
(cherry picked from commit b49d4ca1539cd9f473e0ee0c79a4287c0d5fe03b)
2025-08-24 23:18:10 +08:00
xun.zhang
5829f09121 ENH: add manual grouping mode stats
1.In auto mode,display the statistics of auto mode and single
extruder
2.In manual mode,display the statistics of manual mode and auto mode
3.Support by object mode

jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: If54c4db79f33d5278c0f18d01ab0518e8660f9c7
(cherry picked from commit 2dbc5c939666e294c805ee4bf33ec09976688be3)
2025-08-24 23:18:08 +08:00
xun.zhang
76957d79ef ENH: add filament saved by multi extruder
1.Add filament flush,filament change count reduced by multi
extruder

NTOE: cases when printing by object haven't been handled

jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Iaaea5f8ffae2345df5a6f1dc605342d835974d48
(cherry picked from commit ad65cdb909b29210117f690a119ef76b70373da4)
2025-08-24 23:18:08 +08:00
Noisyfox
5f3d91a1cd Don't bother with extruder variants
Fix compile error
2025-08-24 23:18:08 +08:00