Commit graph

166 commits

Author SHA1 Message Date
zhou.xu
7d3acd75ae 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
2375ab860a 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
606d28dc26 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
6a2d4b878b 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
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
f9869d4b5b 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
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
xun.zhang
05bf5c114b 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
e0435c3e31 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
38ed01f61f
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
1f9d27d880 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
eac07fd8e3 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
ac19851e52 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
f888fafc07 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
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
Mack
b6197c460b FIX:loss is_auto
jira: nojira
Change-Id: I3511b0abdbdb94b9517a1b21c95ce224d0f7422d
(cherry picked from commit c4cdc2e8f3960a9128ab7a8a7a62717351bcdbbc)
2025-08-24 23:18:22 +08:00
Mack
e26e2ca793 ENH:change Color Arrangement ui
jira: nojira
Change-Id: I77f84675da0b4fe7069c76c14668026fc3d8932a
(cherry picked from commit 785b8c7b2f5ee014fedea57a88693888d2b8ca26)
2025-08-24 23:18:20 +08:00
Mack
8bfe3a818c 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
c9708236ac 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
1b70bd38f2 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
135b39526e 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
f702ad9fd2 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
0116923f58 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
6c6e9afd02 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
9380260a74 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
6598b626e7 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
8331f8eba8 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
067d1484ab 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
afac07c166 Don't bother with extruder variants
Fix compile error
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
Mack
5e64197e08 FIX: inconsistent colour arrange display at different resolutions
JIRA: no
Change-Id: Id838bf68c8a58d9075994052af10fa31bacc2ed3
(cherry picked from commit 91ea29eb56a148606cc645dfbca17fe470cb6131)
2025-08-24 23:18:06 +08:00
zhimin.zeng
2ff3b46a7e FIX: fix build error
jira: none
Change-Id: I97df69b728fc3871b7c33e1fd3ba068e741d51c7
(cherry picked from commit 326d7d28b47017bdbd98873a6437ef84116291ba)
2025-08-24 23:18:05 +08:00
Mack
d7029d383f FIX:gcode viewer color arrangement recommendation
1.Limit of four filaments per row

2.Fix incorrect data

3.Add filament id display

4.Optimised layout

Change-Id: I9ac3701c99597a5ed243dac0e3e371cf9aca4066
(cherry picked from commit 3321277f86dfeb9de80b40c320e20dd5f33eab51)
2025-08-24 23:18:05 +08:00
Mack
fb2226208a NEW: gcode viewer add recommended colour filament widget
Change-Id: I37f38a175bb3f4a574a4855f8fef04e704da259c
(cherry picked from commit 4014c61f889f5cf0b7830123fb0a72690ff4e1e5)
2025-08-24 23:18:04 +08:00
niklasb
586921fa4d
GCodeViewer will now always show the estimations (#10333)
Co-authored-by: SoftFever <softfeverever@gmail.com>
2025-08-24 20:13:34 +08:00
Alexandre Folle de Menezes
fa70582ed1
Standard units don't need translation (#9965)
Some checks are pending
Build all / Build All (push) Waiting to run
Build all / Flatpak (push) Waiting to run
2025-06-22 15:10:40 +08:00
Simone
dd6b0fb793
Fix character spacing issue in GCODE preview for Italian (#9778) (#9914)
Some checks are pending
Build all / Build All (push) Waiting to run
Build all / Flatpak (push) Waiting to run
2025-06-17 20:36:04 +08:00
Alexandre Folle de Menezes
3e48390cee
Remove markers from strings that don't need to be translated (#8842)
Remove markers from text that does not need to be translated
2025-05-11 15:04:48 +08:00
Alexandre Folle de Menezes
d37f1b6a81
Fix english strings consistency (#8881)
* "non zero" -> "non-zero"

* "Z hop" -> "Z-hop"

* "works" -> "is working"

* "version at least x" -> "version x or higher"

* "printing job" -> "print job"
"to print on" -> "printing on"

* "is not find" -> "was not found"

* "boundary of plate" -> "plate boundaries"

* "toolchange" -> "tool change"

* "colour" -> "color"

* "cancelled" -> "canceled"

* "can not" -> "cannot"

* "gcode" -> "G-code"
2025-04-26 19:59:49 +08:00
Noisyfox
e2b16f527a
Improve gcode preview flow rate scale (#9319)
* Ignore very tiny extrusions in flow rate scale (SoftFever/OrcaSlicer#9190)

* Don't show flow rate if it's not extrusion

* Merge branch 'main' into bugfox/gcode-viewer-flow-scale
2025-04-23 23:37:08 +08:00
Dipl.-Ing. Raoul Rubien, BSc
82bc52cbcc
hotfix: avoids legend-viewer horizontal overexpansion on linux (#9171)
hotfix: avoids legend-viewer horizontal overexpansion on linux (enhancement 9fe905c)
2025-04-10 23:50:41 +08:00
yw4z
9fe905c47d
gCode Legend & Viewer Improvements (#8198)
* commit

* update buttons and icons

* Update GCodeViewer.cpp

* Update GCodeViewer.cpp

* Update GCodeViewer.cpp

* replace invisible item icon

* reduce code changes & add svg icons for hidden / visible

* update

* Update GCodeViewer.cpp

* Update GCodeViewer.cpp

* Update GCodeViewer.cpp

* fix window width when scrollbar visible

* Update GCodeViewer.cpp

* Update GCodeViewer.cpp

* add corner rounding to all plate stats

* Update GCodeViewer.cpp

* update

---------

Co-authored-by: SoftFever <softfeverever@gmail.com>
2025-03-30 20:07:49 +08:00
andrewleek
118e14d788
Gcode Statistics Panel Fixes (#8172)
* Gcode Statistics Panel - Persist open/close state

Bug: On slicing a model, the Statistics Panel would be reset to being open (regardless of if the user had shut it earlier)

Fix: Now on app open the Statistics Panel will be open, but if the user closes it, its state will persist (regardless of slicing again)

https://github.com/SoftFever/OrcaSlicer/discussions/6021

* Gcode Statistics Panel - fold/unfold button width fix

Issue: The fold/unfold button width is too wide (It seems CalcTextSize is making the button wider than necessary)

Fix: Set the width to a correct fixed value
2025-01-26 08:58:38 +08:00
SoftFever
727a3887c5 Add Orca Filament Library 2025-01-15 22:40:27 +08:00
Noisyfox
3b1c4f9ee4
Do not create raycaster when loading the gcode preview (#7596) 2024-11-30 21:36:22 +08:00
Vovodroid
07d79376d3
Warnings: remove empty code (#6577)
* Warnings: remove empty code
2024-09-07 18:18:35 +08:00
Noisyfox
13e18d1d65 Use a 2-pass depth based outline algorithm when selected 2024-08-18 19:31:08 +08:00
SoftFever
7082e945b1 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
Ocraftyone
b83e16dbdd
Fix Compile Warnings (#5963)
* Fix calls to depreciated wxPen constructor

* Fix use of wxTimerEvent

* Fix unrecognized character escape sequence

* Fix signed/unsigned mismatch

At least as much as possible without significantly altering parts of the application

* Clean unreferenced variables

* fix mistyped namespace selector

* Update deprecated calls

* Fix preprocessor statement

* Remove empty switch statements

* Change int vector used as bool to bool vector

* Remove empty control statements and related unused code

* Change multi character constant to string constant

* Fix discarded return value

json::parse was being called on the object, rather than statically like it should be. Also, the value was not being captured.

* Rename ICON_SIZE def used by MultiMachine

By having the definition in the header, it causes issues when other files define ICON_SIZE. By renaming it to MM_ICON_SIZE, this lessens the issue. It would probably be ideal to have the definitions in the respective .cpp that use them, but it would make it less convenient to update the values if needed in the future.

* Remove unused includes

* Fix linux/macOS compilation

* Hide unused-function errors on non-Windows systems

* Disable signed/unsigned comparison mismatch error

* Remove/Disable more unused variables

Still TODO: check double for loop in Print.cpp

* Remove unused variable that was missed

* Remove unused variables in libraries in the src folder

* Apply temporary fix for subobject linkage error

* Remove/Disable last set of unused variables reported by GCC

* remove redundant for loop

* fix misspelled ifdef check

* Update message on dialog

* Fix hard-coded platform specific modifier keys

* Remove duplicate for loop

* Disable -Wmisleading-indentation warning

* disable -Wswitch warning

* Remove unused local typedefs

* Fix -Wunused-value

* Fix pragma error on Windows from subobject linkage fix

* Fix -Waddress

* Fix null conversions (-Wconversion-null)

---------

Co-authored-by: SoftFever <softfeverever@gmail.com>
2024-07-29 21:00:26 +08:00
Azi
b40e6c0b9a
Fixing high GPU usage when color scheme is set to "Filament" or "Speed" (#6223)
removed imgui.set_requires_extra_frame(), this line causes Slic3r::GUI::GLCanvas3D::render() to be called repeatedly when 'Filament' or 'Speed' is selected for preview panel
2024-07-25 22:38:05 +08:00