Commit Graph

72 Commits

Author SHA1 Message Date
zhimin.zeng
9cdabfbd59 FIX: Remove unprintable_filament_map
jira: none
Change-Id: I30285d0cc98a974e71f16fd9adb57dfcccb39415
(cherry picked from commit 1959fa7d5c213a7720b8f215f1578597278e6920)
2025-09-18 14:13:51 +08:00
lane.wei
ac4a4ca8ba ENH: CLI: fix some potential issue under cli
jira: no-jira
Change-Id: I411e7a18b0eacc27f28a4b6d2205cd6460b6cd1a
(cherry picked from commit 84bbf31ab5d4a30afde7c512147fcbe9b85fb57b)
2025-09-18 11:06:36 +08:00
xun.zhang
a8b5bfd809 ENH: add default value in extruder info for cli
jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I15fb33c55a8f8e5bf75807ca16b00d50226ee156
(cherry picked from commit bf97aea2e405e41031de7b20eb59054f65b9a0fa)
2025-09-18 10:08:33 +08:00
lane.wei
5b9e4a4862 ENH: CLI: only check filament conflicts before slicing when there is one color
jira: no-jira
Change-Id: I17fc917b624578491170656372e4c4d1b43f0412
(cherry picked from commit 53a551174e682694374e539572e5337791e0a7d8)
2025-09-17 23:31:09 +08:00
lane.wei
6f2f8c584e ENH: wipe_tower: use uniform wipe tower logic for cli and gui
jira: no-jira
Change-Id: I179212585871071cd17bd37c2756444a2d7aba1f
(cherry picked from commit 1f3dde94980d3685bb4d1266e8a5448b8f231b9f)
2025-09-17 23:29:14 +08:00
lane.wei
5e04588837 ENH: CLI: keep the params of old version
jira: STUDIO-10695
Change-Id: I4b0a768bc4fc6c856c9c92fa4a05007a3097df35
(cherry picked from commit a44da293ad3a1fbc62e318c20b3ba7c187fc1d25)
2025-09-17 23:09:07 +08:00
zhou.xu
a84ede4467 FIX:set "ban_light" true for picking_thumbnail in linux
jira: none
Change-Id: I68912a17f6bd3ffb73fc6480e5fd95a690c1c872
(cherry picked from commit 1acfe83fc0c49734996a0e2596856fd7881b4d68)
2025-09-17 21:49:40 +08:00
lane.wei
eb1964feb2 FIX: CLI: fix the filament_map incorrect issue
jira: no-jira
Change-Id: I8f389ae1dca2cbe79a2db7a5e9fbb94da430d037
(cherry picked from commit 89308c8676e4f953a69198f706852e8b6d42231c)
2025-09-17 17:53:45 +08:00
lane.wei
22000cc7a4 FIX: CLI: fix the crash issue caused filament_id missing
jira: no-jira
Change-Id: I6256a846cf30f304deda32f61ed5329aacdb5f73
(cherry picked from commit d14e3f42a0a16951651a47d49e05e509ee4696c0)
2025-09-17 10:21:15 +08:00
lane.wei
5e4a2f3bc1 FIX: CLI: fix the stl name not correct issue when using export-stl
jira: no-jira
Change-Id: I5cd83c9fb787416d5045470025fa96696d8bfab9
(cherry picked from commit 49b1568877345b1eb9bdfacac19d451569433f3f)
2025-09-16 15:42:48 +08:00
qing.zhang
e7e6405ad3 ENH:instead of prime_volume by filament_prime_volume
Jira: none

Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I96e7d0604da8f90678feed81833e3a634752ffff
(cherry picked from commit be02e769bb49680d6be678fc5fa73a141ca8da1c)
2025-09-16 10:39:19 +08:00
jiangkai.zhao
8723b6987d ENH: enhance some functions of the wipe_tower
1.Add automatic calculation of the wipe_tower's brim width by height;
2.modify the min_depth_per_height and the default ridwidth

jira: none
Change-Id: Idd96bc90e8e631aa8481b559e1e9fec24c6b822f
(cherry picked from commit 4dd4e9e12c02d945a0ac3fd2020f75313c5b2cc9)
2025-09-13 18:49:41 +08:00
zhou.xu
3e9a8b8b3a FIX:add error deal:mtl file lost some material
jira: github 5687
Change-Id: I2394d27b027cfe34ac3cb260735aceaee65ff6d9
(cherry picked from commit 58f9c7d0b2800c4b8b67991f5d3e43d57a6cd1eb)
2025-09-09 10:14:19 +08:00
zhou.xu
926c22b797 NEW:add "obj preview thumnailData" function
jira: none

Change-Id: I688c2f05bf85fca376418115acddb5066ef980eb
(cherry picked from commit 16f2b2bcb5fd157f25aa7012dabd99a8d31aec07)
(cherry picked from commit 7cc21b5e9745a84d75ea13b66f5653520bb1cba3)
2025-09-09 09:39:43 +08:00
lane.wei
d4d86a5966 ENH: CLI: add support for colored obj
jira: no-jira
Change-Id: If9e698d60b71e8835a3ae46c75e9c8c2878556a7
(cherry picked from commit a2b2ec9cb80e3bafabd07a377aff9e11188be346)
(cherry picked from commit 201d3b18cc9d482192c9962717527f9e12ed6603)
2025-09-07 23:58:51 +08:00
xun.zhang
3488ac6292 FIX: crash of filament group in cli mode
1. Add protection for building machine filaments.Sometimes we don't
know the info about maahcine filament

jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I3198d3a1a8825aa50aa49734f60a32620fc4f890
(cherry picked from commit 0c60cefe5e188ba966f4c254f833ae81bc5da476)
2025-09-07 00:47:24 +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
lane.wei
c01c0c90b6 ENH: CLI: fix an exception in CLI testing
when update filament configs, we need to use the old filament variant count
jira: STUDIO-9201

Change-Id: Ibc0084997c264d8527dc9998018907c8af4b2043
(cherry picked from commit 462bfb0b6e941e2771440d8ee06cea149162b595)
(cherry picked from commit a54abad44c572cee0e39ef60822033739b3c3306)
2025-09-05 17:46:35 +08:00
lane.wei
7c1830c04b FIX: CLI: fix the crash issues after new print_diff logic
jira: no-jira
Change-Id: I47beb83b96fcbd2322c878fa4edd5675749f0791
(cherry picked from commit c863a8268fea8fe79cbc4522d6642533474d429b)
2025-08-28 11:23:15 +08:00
lane.wei
bc9c08a614 ENH: version: refine file version process logic
only compare minor version when major equals
jira: no-jira

Change-Id: I0159c1b15db30238ad05b8ff7c83f6668fd11ac2
(cherry picked from commit e50e6985925582b4b686793244cc88bde3515d07)
2025-08-26 21:14:51 +08:00
lane.wei
ca5bd00d0e ENH: config: refine the object config logic when extruder count changes
1. add logic in CLI
2. add logic to process height range
jira: no-jira

Change-Id: I8a7ba1a78dacad7131cafa3fb8b742027276c7e8
(cherry picked from commit 9a6624653b7b66101f1a74715227a0f2b4588f16)
2025-08-26 10:11:47 +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
lane.wei
928debaff8 FIX: CLI: fix the crash issue with no args
jira: no-jira
Change-Id: I21a15d5fee87036fcc4b5d1b6ada47f43c9b43b1
(cherry picked from commit 8d93a26c5b303f662f3ec9f37ebac0b9f792ac5e)
2025-08-24 23:18:29 +08:00
lane.wei
d0cbf620d7 FIX: config: fix some loading issue with filament_self_index
1. generate filament_self_index for old files in cli
2. set filament_self_index to default for old files using single extruder
jira: no-jira

Change-Id: I6e3f520723ee7f3a75634121604023ba319ff97a
(cherry picked from commit d050aa4d3609e7ccf072b23fbfe820a839e0c3fd)
2025-08-24 23:18:28 +08:00
Noisyfox
f04a3dced9 Fix compile error 2025-08-24 23:18:25 +08:00
lane.wei
db0f3e484a ENH: CLI: support multi-extruder slicing
1. add slicing errors for gcode in unprintable area, also for filament mapping
2. use common area for auto arrange
3. support filament_map/filament_map_mode related params
4. add logic to check the filament maps before slicing
5. uptodate support multi-extruder
6. switch new machine/filament support multi-extruder
7. process config params support transfer between mult-extruder and
   single-extruder
8. improve machine-limit logic support multi-extruder
9. flush-volume support multi-extruder
10. add default params to support auto mapping slicing

jira: no-jira
Change-Id: Ice39a365841322ddb586d39c56ff923626822528
(cherry picked from commit f518d6804a9de69deef81c20cd22005a4bbd0cd4)
2025-08-24 23:18:25 +08:00
Noisyfox
82497c18db Fix build error 2025-08-24 23:18:13 +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
84dc2d8835 ENH: flush_volume support multi_extruder and fix bug
Change-Id: Id6b041f71ee6e55e68a6937f24ce791caac8e708
(cherry picked from commit 6fbad9ed33b2868a2fffbebdc3a98926431a1093)
2025-08-24 23:18:01 +08:00
SoftFever
883607e1d4 Refactor folder (#10475)
Move many third-party components' source codes from the src folder to a new folder called deps_src. The goal is to make the code structure clearer and easier to navigate.
2025-08-22 20:02:26 +08:00
SoftFever
7f8f807500 Fixed an issue that Orca won't run if multi-Config generator is used on Linux(Fedora) 2025-07-04 23:02:24 +08:00
SoftFever
a4f35e0291 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
Noisyfox
032e6c8580 Fix non-windows build (#9509) 2025-04-29 13:02:22 +08:00
SoftFever
9913736b41 Fixed a bug that console window was created when --datadir parameter is used (#9506)
* attach console for Windows when command line is used

* fix version check failer in command line mode

* attach console only when we need to print help info
2025-04-28 23:27:20 +08:00
SoftFever
5bf1596d65 attach console for Windows when command line is used (#9450)
* attach console for Windows when command line is used

* fix version check failer in command line mode
2025-04-27 22:38:40 +08:00
Noisyfox
228b50f858 Ensure bed shape is in correct orientation (SoftFever/OrcaSlicer#9345) 2025-04-15 12:51:01 +08:00
SoftFever
b1de545ff9 Merge branch 'main' into dev/step-import-dialog 2025-04-05 17:47:59 +08:00
Noisyfox
ed45bf425e Use boost::nowide directly from boost (#9037)
* Use `boost::nowide` directly from boost

Cherry-picked from prusa3d/PrusaSlicer@bffa3f8578

Co-authored-by: tamasmeszaros <meszaros.q@gmail.com>

* Replaced all occurrences of boost::nowide::narrow for wxStrings with into_u8

Cherry-picked from prusa3d/PrusaSlicer@8d6497297a

Co-authored-by: tamasmeszaros <meszaros.q@gmail.com>

* Fix flatpak build
2025-03-29 20:14:10 +08:00
Mack
0bc2444079 ENH:Add 'Don't show again' to the step mesh
jira: STUDIO-8606
Change-Id: I2382b9052e2c994a458ad36ca61eb94c517927c6
(cherry picked from commit 0cce6619ce12aa8540f6dfca6d9ee79ffba65c19)
2025-03-27 22:17:07 +08:00
Noisyfox
d89520c8ae Avoid message box if font load failure during startup (#8610)
Move init sys font into GUI_App, after logging has been set up properly (#8603)

This avoid annoying messagebox if somehow failed to load font on windows, and write the message into log files instead
2025-03-01 13:22:05 +08:00
SoftFever
1c43b2902c fix a build error 2024-10-07 18:10:14 +08:00
uSyzex
7b38376e4e FIX: CLI: fix an exception when parsing scale params 2024-10-06 13:36:12 +02:00
SoftFever
5b5cd478c2 Merge branch 'main' into skirt-object-fix-pr 2024-09-07 10:57:59 +08:00
Vovodroid
2eb1adb719 Reduce warnings: remove unused variables (#6499)
Removed unused variables
2024-08-23 00:02:58 +08:00
vovodroid
e0089dfe9f Fix typo cleareance_radius -> clearance_radius 2024-08-22 09:05:19 +03: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
SoftFever
b7a0b30578 Pick updates from BS 1.9.3
sync bbl profiles
FIX: [#4320] crash when edit project preset

github: #4320

Change-Id: I81eb5f0d461565d63a32100a5bebb4569cfb0b1b
ENH: add pctg type

Jira: none

Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: Ie01fcd4bef0d3ebec5bbd7185a87a1740068bdba
(cherry picked from commit c6276932dd92bc4283600954415eedeac6d351ce)
ENH: CLI: add logic to save metadata into 3mf from CLI

JIRA: no jira
Change-Id: I7f96c2ab9671ec1c0115e90f6d64230b8170eb38
(cherry picked from commit 3d2d6e23ba318a2b331a62e320f8ca199168f1f5)
2024-06-21 18:21:21 +08:00
SoftFever
554366d493 Take brim width into consideration when placing wipe tower 2024-06-16 18:48:26 +08:00
SoftFever
27f140fb18 Mdel preview renders the actual colors of the filaments based on the filaments currently loaded in the AMS
Ported from BambuStudio
2024-06-16 17:15:51 +08:00