Commit Graph

10033 Commits

Author SHA1 Message Date
tao.wang
39af16577e ENH:support set ams filament
jira:[for 2nozzle setting]

Change-Id: Ib9e20bcdf6d8ea1bf5dd5e8624a68730e05e69ad
(cherry picked from commit 78c592819473b1291d1bec1126ccbf7d86bb17d5)
2025-05-07 15:13:39 +08:00
tao wang
04ac43949b ENH:support parse new print data
jira:[for new print data]

Change-Id: Iac6747e9ade690fcdf3b7b11239fe183bc7c3796
(cherry picked from commit 6c02c7bc8c77a481253e6c574f7bc13ff2cfcbdc)
2025-05-07 15:01:17 +08:00
zhimin.zeng
442e13975e ENH: add default item for pa
jira: none
Change-Id: I4ad3bd094325bdbd1e6b013a91766214951dc032
(cherry picked from commit 0c772105f946121c292f92ab3ca1d050b898311b)
2025-05-07 14:33:38 +08:00
zhimin.zeng
1993ec332e FIX: the default value is not correct
and the pa profile not display in AMS setting dialog after switch nozzle diameter
jira: 8620

Change-Id: If40bfe41ae13f5199f09baae3af09757498f1edf
(cherry picked from commit f3064e223df468eb9901e65c8f0abab2dae91f15)
2025-05-07 14:27:03 +08:00
tao.wang
3a7cc8384e FIX:fixed some amscontrol issue
jira:[for fix amscontrol issue]

Change-Id: Id62ffd047403bf80f6aba732b8ce31d782bcea57
(cherry picked from commit 55898ab88ee844dd7da17d992ad8f79e439f96a0)
2025-05-07 14:27:02 +08:00
Noisyfox
68ba9f80c4 refactoring the modules of amscontrol
adapted from bambulab/BambuStudio@b78fa4c11c

Co-authored-by: tao wang <tao.wang@bambulab.com>
2025-05-07 11:30:29 +08:00
Noisyfox
8d2f4a21c3 Fix setting AMS calib profile
ENH: calib support multi_extruder

1. backend support multi_extrude data structure
2. Compatible with third-party calibration

(cherry picked from commit bambulab/BambuStudio@21e6271e59)

Co-authored-by: zhimin.zeng <zhimin.zeng@bambulab.com>
2025-05-06 23:04:35 +08:00
Noisyfox
599155b8bb Merge remote-tracking branch 'remote/main' into dev/bbl-network-upd 2025-05-05 19:22:34 +08:00
xun.zhang
310326c504 FIX: wrong curr bed type in print page
1.Get bed type from project config

jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I1f1b9185dd4592b5fd3b03f07e8cde7b7d26510e
(cherry picked from commit 1c90355199384903f166730c5bb43c6a6baaa1cf)
2025-05-05 19:18:39 +08:00
tao wang
877452221a FIX:fix the issue of macOS crashing easily
jira:[udesk 7578206]

Change-Id: If5e0b2d0969ca70815a5d2c9cca71654c9e1817b
(cherry picked from commit 8dfa6839e5e3a9bebb03616ff6d0c0c1699ad22f)
2025-05-05 19:18:13 +08:00
hang.xu
6de350c30f FIX: Bed type display
jira: none

Change-Id: Ibac2a7a80d6841ebea639e0a58547413df6f5c74
(cherry picked from commit 2c3fa062c92da50f839432a43356d491c2e5bbba)
2025-05-05 19:13:50 +08:00
hang.xu
2048c56daf FIX: Add bed type in send print page
jira: STUDIO-7824

Change-Id: I64d9ed41b862ed4e3b8c21218c289132d767105e
(cherry picked from commit 7bb5060b739b3a95fe889ae64e8d7289e2c928d9)
2025-05-05 19:10:45 +08:00
yw4z
bdfc873d15 Fix: 2Dbed step calculation for grid not working (#9550)
init
2025-05-05 17:59:00 +08:00
Dipl.-Ing. Raoul Rubien, BSc
b579e44704 Fixes compile error with SLIC3R_PCH=OFF (#9543)
fixes compile error with SLIC3R_PCH=OFF
2025-05-05 17:55:17 +08:00
Noisyfox
4f6aeb5815 Fix crash when start print from sdcard 2025-05-05 17:17:03 +08:00
tao wang
5373780303 FIX:fixed the issue of multiple plates object card not flip pages
jira:[STUDIO-9373]

Change-Id: I520b2626da8dc3acc066b2ea26a5f8d3c27f64fb
(cherry picked from commit aee0cb382ba40607c278dbd68e5134fa26a2027c)
2025-05-05 17:09:18 +08:00
tao wang
5150e61f8b ENH:Hide multi disk switching
jira:[for demo]

Change-Id: I4cbfde15ec2b6f7e8aa68e8654ebea0e9cb09b9c
(cherry picked from commit 370be63709f1d8f3bdaa923023b71afed0391edb)
2025-05-05 17:03:20 +08:00
Noisyfox
4e7a874992 Merge branch 'main' into dev/bbl-network-upd 2025-05-05 15:21:17 +08:00
yw4z
00de73d9ee Fix exclusion area shape and color (#8792)
* Update PartPlate.cpp
2025-05-04 23:12:04 +08:00
yw4z
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
Noisyfox
fe2847f936 Show proper printer names on printer selection page (#9363)
* Show actual printer name from sub_path files on printer selection screen

* Merge branch 'main' into bugfox/preset-name-consistency
2025-05-04 16:02:15 +08:00
yw4z
807ac559ff Match UI style of object list (#9494)
* Update GUI_ObjectList.cpp

* fix scaling issue on arrow

* Update GUI_ObjectList.cpp

* Update name column on Linux as well

* Always use column width from `m_columns_width`

* Always use column width from `m_columns_width`

* Remove object list extra horizontal spacing on macOS

* Remove object list header

* Avoid negative width

* Fix compile error

---------

Co-authored-by: Noisyfox <timemanager.rick@gmail.com>
2025-05-03 12:01:09 +08:00
SoftFever
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
Noisyfox
b652f7eb7e Fix vendor/model selector on create printer dialog (#9344)
* Make sure printer vendor matches

* Handle cases where some vendor do not have printers (such as `OrcaFilamentLibrary`)

* Ignore vendor `custom printer` from create printer vendor list

* Fix missing end bracket

* Update printer vendor and model list on create printer dialog
2025-05-01 17:12:03 +08:00
Noisyfox
3e41354b7b Fix Xcode 16.3 build (#9422)
* Fix build with Xcode 16.3

* Simplify OpenVDB patch, from 930c3acb8e (diff-bc3061cc2fe6c64a3d67c8350330bb3a530d01037faace6da27ad9a12aa03e29)

* Fix CGAL header under clang 19
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=281880

* Fix compile error due to removal of base template for `std::char_traits` in clang 19
https://releases.llvm.org/19.1.0/projects/libcxx/docs/ReleaseNotes.html#deprecations-and-removals
2025-05-01 17:09:45 +08:00
Noisyfox
b212ce8bb1 Add option to toggle between legacy and new network plugins 2025-05-01 16:23:56 +08:00
tao wang
bb509ce63b NEW:support new mapping type
jira:[support new mapping]

Change-Id: I88e5d3b6966d4ed1e8098d13fe9335fecf6e01c4
(cherry picked from commit c0932e16ff9fcae0e900c6e0cac9a5b496d0cc0e)
2025-05-01 15:54:19 +08:00
tao wang
73e729b7eb ENH:support new amsmapping data
jira:[for 2 extruder]

Change-Id: Ie03eae17d600bc68451511a0179f20d1919ff6ea
(cherry picked from commit 0848c26da97c7b74e98645b9a0873fe928fdf631)
2025-05-01 15:54:18 +08:00
Noisyfox
702755548c Support both old and new version of BBL network plugin 2025-05-01 15:54:17 +08:00
Noisyfox
23c8a46240 Fix object search bar on macOS and Linux (#9473)
* Remove unused search code

* Reimplement the object search bar (SoftFever/OrcaSlicer#7438)

* Fix result list when search text is empty

* Prevent infinite focus loop

* Update layout on Linux

* Fix focus on macOS

---------

Co-authored-by: SoftFever <softfeverever@gmail.com>
2025-05-01 15:21:11 +08:00
yw4z
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
Alexandre Folle de Menezes
1515284df3 Add translation markers on more unstranslated strings (#9134) 2025-04-26 23:11:36 +08:00
Alexandre Folle de Menezes
aac4337b6d 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
179553a1b5 Make sure exclusion area is correctly rendered even in wrong orientation 2025-04-26 12:38:13 +08:00
Noisyfox
cd8b4c7091 Merge branch 'main' into bugfox/bed-shape-orientation 2025-04-26 12:35:23 +08:00
yw4z
108a8cb230 Modernize Object Search Box & Improvements for Parameter Search Box (#9434)
* update

* Update Plater.cpp

* Update Plater.cpp

* Update Plater.cpp

* Update Plater.cpp

* Update Plater.cpp

* Update Tab.cpp

* update

* Update Tab.cpp

* Update Plater.cpp

* Update Tab.cpp
2025-04-24 22:33:50 +08:00
yw4z
771f690d02 Modernize wxButtons on Parameters & Physical Printer window (#9459)
* update

* Update Tab.hpp
2025-04-24 16:09:39 +08:00
yw4z
d29f1efa93 Fix: Rotation gizmo axis line colors not matches with axis colors (#9427)
Update GLGizmoRotate.cpp
2025-04-24 15:41:36 +08:00
Noisyfox
c72d21d5b6 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
yw4z
04282e0b89 Add icon to Profile dependencies (#9455)
Update Tab.cpp
2025-04-23 19:49:52 +08:00
yw4z
7e2f4df5aa Fix alignment of plate name text an its input box on plate settings window (#9456)
Update PlateSettingsDialog.cpp
2025-04-23 19:49:25 +08:00
yw4z
285388359a Fix: Prevent move of Advanced toggle when highlighting Global / Objects switch (#9445)
Update ParamsPanel.cpp
2025-04-22 12:47:07 +08:00
Noisyfox
62f22601e5 Merge branch 'main' into bugfox/bed-shape-orientation 2025-04-20 18:21:31 +08:00
yw4z
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
Vovodroid
e68d4dc41b Search whole option string. (#9391)
Tune fuzzy match coefficients
2025-04-20 16:09:31 +08:00
Azi
7fa923e3dc Fixed some UI glitches about the All checkbox in the dependency tab (#8949)
* bugfix:All button doesnt get checked on tab-reopen when the selection is empty

* bugfix:when dep tab is open, and you check All, hitting reset all doesnt update the All button correctly; also partially fixed the bug that checking All doesnt flag the tab as dirty

* fixed a bug where checking All in dependency tab doesnt flag the field as dirty

---------

Co-authored-by: Noisyfox <timemanager.rick@gmail.com>
Co-authored-by: SoftFever <softfeverever@gmail.com>
2025-04-20 14:44:58 +08:00
yw4z
adaac28e2a Icon fixes and improvements (#6204)
* Fix blurry AMS icon on sidebar

* Fix search icon anti aliasing problem

* home page thumbnail / new / open / delete / explore icons

* Homepage > finetune color of thumbnail image

* Custom filaments > Edit button

* Update homepage thumbnail image

* BBL printers > Device / Calibration tab > Printer icon blurry

* Update homepage open project icon

* Homepage > User rectangular Orca logo for UI consistency

* Add new icons for parameters

* Update bed plate Move to Front icon

* Update project page icons

* revert changes on homepage context menu

* Add dependencies icon

* fix document icons on project page

---------

Co-authored-by: SoftFever <softfeverever@gmail.com>
Co-authored-by: Noisyfox <timemanager.rick@gmail.com>
2025-04-20 13:20:20 +08:00
Noisyfox
97952cc419 add filament_vendors:FusRock (#9361)
Add FusRock and keep the alphabetical order

# Description

<!--
> Please provide a summary of the changes made in this PR. Include
details such as:
  > * What issue does this PR address or fix?
  > * What new features or enhancements does this PR introduce?
> * Are there any breaking changes or dependencies that need to be
considered?
-->

# Screenshots/Recordings/Graphs

<!--
> Please attach relevant screenshots to showcase the UI changes.
> Please attach images that can help explain the changes.
-->

## Tests

<!--
> Please describe the tests that you have conducted to verify the
changes made in this PR.
-->
2025-04-16 11:48:05 +08:00
Rodrigo
41ba5f8845 Junction Deviation Machine Limit (#9234)
* Junction Deviation Machine Limit

jd 3

JD menu 2

JD operativo

limpieza

final

* default JD print menu without warnings

* to fix multiple instances

* Only at first layer

* Calibs upgrade

* Shown on Marlin2

Shown on Marlin2
CodeCleaning

* Update Calibration.md

* set on writer

---------

Co-authored-by: Ian Bassi <ian.bassi@outlook.com>
2025-04-15 21:49:17 +08:00
FusRock
34d9018954 add filament_vendors:FusRock
Add FusRock and keep the alphabetical order
2025-04-15 16:25:26 +08:00