juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-09-08 17:57:44 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,367 Commits 51 Branches 82 Tags
c0c2cc5068bff9ef5e5f4e4138fa25fa1f4e65d2
Commit Graph

145 Commits

Author SHA1 Message Date
Anson Liu
b422636740 Move Generic vendor above Bambu vendor in AMS material setting. (#11306) 
* Move Generic vendor above Bambu vendor in AMS material setting.

* Remove hardcoded sorted_names. Alphabetically sort Bambu with all vendors

* Fix sorting with case insensitive comparison

* Use arithmetic to get rank distance because priorities are stored in a vector. This lets us remove the <interator> include.
 2026-08-11 14:51:25 +08:00
Anson Liu
c806a09c7c Show current filaments at top of AMS filament dropdown (#11293) 
* Move currently active filaments added to the Prepare sidebar to the top of the AMS Material Selection combo box.

It is likely the user wants to set the material to the currently active filament.

* Reduce logging verbosity.

* Refactor current active preset filament finding to find nested preset inheritance.

* Initialize pointer to null before usage.

* Remove old commit code

* Remove new line

---------

Co-authored-by: Ioannis Giannakas <59056762+igiannakas@users.noreply.github.com>
Co-authored-by: yw4z <ywsyildiz@gmail.com>
 2026-08-10 11:04:17 +08:00
SoftFever
40a875800d Resync the AMS and device dialogs 2026-07-17 06:48:15 +08:00
SoftFever
74813b401f Merge remote-tracking branch 'origin/main' into feature/h2c_support_clean 
# Conflicts:
#	localization/i18n/fr/OrcaSlicer_fr.po
#	localization/i18n/list.txt
 2026-07-14 02:54:20 +08:00
foXaCe
c41e685a69 i18n: wrap hardcoded GUI strings (undo/redo labels, dialogs, notifications) + FR (#14729) 2026-07-13 12:19:33 -03:00
SoftFever
28b7127150 feat(gui): multi-nozzle UI for H2C/A2L 
Multi-nozzle sync widget, AMS rack-nozzle mapping popup, calibration rework, send-dialog nozzle mapping and extruder-count UI. Includes the fix to persist the AMS sync badge on filament cards (H2C/A2L and direct-sync printers).
 2026-07-09 01:16:26 +08:00
Clifford
04aa26da9a Fix nozzle diameter guards for printers that don't report nozzle info (#13255) 
Fix nozzle diameter guards for printers that don't report nozzle info (#13236)

PR #12814 changed DevNozzle::m_diameter default from 0.4f to 0.0f to
mean "unknown" when firmware doesn't push nozzle info, and guarded two
call sites in SelectMachine.cpp. PR #13330 introduced
DevExtderSystem::NozzleDiameterMatchesOrUnknown() and adopted it in
get_printer_preset / CalibUtils / CalibrationWizardPresetPage. A few
reachable sites were still left out and now report "mismatch" / fail
silently for every non-BBL printer (Klipper/Moonraker, RRF, Marlin,
etc.) that doesn't push BBL nozzle data.

The most visible symptom: the "Sync filament colors from AMS" button on
Moonraker printers with AMS/AFC silently does nothing, because
get_printer_preset() couldn't find a matching system preset (fixed in
#13330, but the lookup-string sites below kept the bug visible
elsewhere).

Apply NozzleDiameterMatchesOrUnknown at the two remaining comparison
sites:

  src/slic3r/GUI/Plater.cpp
    - file-load printer-mismatch dialog — don't prompt on every load
    - on_select_preset sync_extruder_list gate — skip 0.0 extruders

For the three filament-lookup string-builder sites, fall back to the
currently-selected printer preset's nozzle diameter so the dropdown
isn't empty when firmware hasn't reported a diameter:

  src/slic3r/GUI/AMSMaterialsSetting.cpp (Popup + on_select_filament)
  src/slic3r/GUI/CaliHistoryDialog.cpp (get_all_filaments)

Also remove the dead SyncAmsInfoDialog::is_same_nozzle_diameters method
surfaced while auditing the affected sites — it was introduced
2024-12-30 in commit ad79ed6d93 ("ENH:add SyncAmsInfoDialog",
cherry-picked from Bambu's internal branch) but a caller was never
wired up on the OrcaSlicer side. Dead since introduction.

Fixes #13236
Refs #12814 #13330

Co-authored-by: Claude Opus 4.7 <noreply@anthropic.com>
Co-authored-by: SoftFever <softfeverever@gmail.com>
 2026-05-27 20:41:15 +08:00
yw4z
0bee82cee5 Hyperlink class (#9947) 
### FIXES
• 3mf file version check dialog opens bambu releases page instead Orca

### CODE COMPARISON

<img width="112" height="36" alt="Screenshot-20251128125737" src="https://github.com/user-attachments/assets/73718a18-8159-43d5-bb80-0eb90d59a8f6" />

**wxHyperlinkCtrl**
• System decides what colors to use. so blue color is visible even with colors set
• No need to use SetCursor()
```
auto wiki_url = "https://github.com/OrcaSlicer/OrcaSlicer/wiki/Built-in-placeholders-variables";
wxHyperlinkCtrl* wiki = new wxHyperlinkCtrl(this, wxID_ANY, _L("Wiki Guide"), wiki_url);
wiki->SetToolTip(wiki_url); // required to showing navigation point to user
wiki->SetFont(Label::Body_14); // not works properly
wiki->SetVisitedColour(wxColour("#009687")); // not works properly
wiki->SetHoverColour(  wxColour("#26A69A")); // not works properly
wiki->SetNormalColour( wxColour("#009687")); // not works properly
```

<img width="132" height="39" alt="Screenshot-20251128125847" src="https://github.com/user-attachments/assets/f6818dc0-5078-498a-bf09-1fd36e81ebe5" />

**wxStaticText**
• Works reliably on colors and fonts
• All event has to defined manually
```
wxStaticText* wiki = new wxStaticText(this, wxID_ANY, _L("Wiki Guide"));
auto wiki_url = "https://github.com/OrcaSlicer/OrcaSlicer/wiki/Built-in-placeholders-variables";
wiki->SetToolTip(wiki_url); // required to showing navigation point to user
wiki->SetForegroundColour(wxColour("#009687"));
wiki->SetCursor(wxCURSOR_HAND);
wxFont font = Label::Body_14;
font.SetUnderlined(true);
wiki->SetFont(font);
wiki->Bind(wxEVT_LEFT_DOWN   ,[this, wiki_url](wxMouseEvent e) {wxLaunchDefaultBrowser(wiki_url);});
wiki->Bind(wxEVT_ENTER_WINDOW,[this, wiki    ](wxMouseEvent e) {SetForegroundColour(wxColour("#26A69A"));});
wiki->Bind(wxEVT_LEAVE_WINDOW,[this, wiki    ](wxMouseEvent e) {SetForegroundColour(wxColour("#009687"));});
```

<img width="132" height="39" alt="Screenshot-20251128125847" src="https://github.com/user-attachments/assets/f6818dc0-5078-498a-bf09-1fd36e81ebe5" />

**HyperLink**
• Fully automated and single line solution
• Colors can be controllable from one place
• Works reliably on colors and fonts
• Reduces duplicate code
```
HyperLink* wiki = new HyperLink(this, _L("Wiki Guide"), "https://github.com/OrcaSlicer/OrcaSlicer/wiki/Built-in-placeholders-variables");
wiki->SetFont(Label::Body_14) // OPTIONAL default is Label::Body_14;
```


### CHANGES
• Unifies all hyperlinks with same style and makes them controllable from one place
• Replaces all wxHyperlink with simple custom class. Problem with wxHyperlink it mostly rendered as blue even color set
• Reduces duplicate code
• Adds wiki links for calibration dialogs
• Probably will add "Wiki Guide" to more dialogs overtime

<img width="349" height="238" alt="Screenshot-20251127212007" src="https://github.com/user-attachments/assets/69da2732-ea35-44de-8ebc-97a01f86328f" />

<img width="355" height="459" alt="Screenshot-20251127212021" src="https://github.com/user-attachments/assets/c0df40f8-c15d-47fa-b31a-cf8d8b337472" />

<img width="442" height="382" alt="Screenshot-20251127212046" src="https://github.com/user-attachments/assets/5d94242b-6364-4b0a-8b2f-a1f482199bd1" />

<img width="225" height="241" alt="Screenshot-20250824171339" src="https://github.com/user-attachments/assets/39ca6af3-6f8a-42ee-bf1d-c13d0f54bb63" />

<img width="442" height="639" alt="Screenshot-20251127212403" src="https://github.com/user-attachments/assets/c1c580f8-3e1b-42f0-aa8e-bac41c2ff76b" />

<img width="476" height="286" alt="Screenshot-20251127212515" src="https://github.com/user-attachments/assets/28b130ce-c7c0-4ada-9842-ff7154c00c21" />

<img width="1460" height="245" alt="Screenshot-20251127212541" src="https://github.com/user-attachments/assets/3fca2649-9cd3-4aea-9153-b2f508fdfefe" />

<img width="401" height="291" alt="Screenshot-20251127213243" src="https://github.com/user-attachments/assets/82b4ec1f-6074-4018-9efa-a1b6b819ae28" />
 2026-01-03 23:06:57 +08:00
yw4z
00ff06a5d3 Match button styles on whole UI and fixes for button class (#11233) 
* init

* web buttons

* Bind Dialog & Fix states

* update

* update

* Update common.css

* objcolordialog

* privacy update dialog

* Update CaliHistoryDialog.cpp

* Update MultiMachineManagerPage.cpp

* Update AMSControl.cpp

* TipsDialog

* Update AMSMaterialsSetting.cpp

* extrusion calibration

* Update UpdateDialogs.cpp

* recenterdialog

* update

* Update Calibration.cpp

* update

* update

* update

* fix

* update

* ReleaseNote

* update

* update

* fix remember checkbox position

* add comments
 2025-12-18 12:14:56 +00:00
Noisyfox
0115cfbdd0 Merge remote-tracking branch 'upstream/main' into dev/p2s-pr 2025-11-07 10:42:06 +08:00
Anson Liu
e8464dd69c Fix AMS Material Selection to sort by both filament vendor and type (#11261) 
Fix AMS Material Selection dialog combo box sorting to also sort by filament types.
 2025-11-07 10:40:47 +08:00
zhimin.zeng
43693ebba9 FIX: cannot select k value when connect 2 printer 
github: 4085
Change-Id: I660f20032535ad8ab1f218224af68f7cc0dc3395
(cherry picked from commit dc94ad4fb63c4907993e6970511bed90337b6c30)
 2025-11-03 20:36:47 +08:00
xin.zhang
46fd6c9794 ENH: ColorPicker use the bmp size 
JIRA: [STUDIO-13908] [STUDIO-14242]
Change-Id: Iac008bcc483b31e3f7e7278a0eea20823eb3bf70
(cherry picked from commit ad9902537c4b1842fd29cfd9fb9eb70681c78327)
 2025-10-28 15:29:56 +08:00
xin.zhang
4a787f6ff8 ENH: clean codes about device 
JIRA: [STUDIO-13609]
Change-Id: I591de7033360b9570600006cfbce2148a8d031d5
(cherry picked from commit e9c774be8f4c89b8dafa14ef56913612fb68bd0c)
 2025-10-02 09:30:48 +08:00
xin.zhang
88eae5d217 ENH: supporting encoded filament color 
jira: [STUDIO-12346]
Change-Id: I7f5ce7806acb6fdeb3e3d9db52a0b96e5fadd759
(cherry picked from commit a7bdc2707d3825327258965c90c33836a7da628b)
 2025-09-25 17:36:29 +08:00
xin.zhang
59ff362296 FIX: update the scale of ColorPicker 
jira: [STUDIO-12704]
Change-Id: Iac12a24fcb880b0c5db6f62b1b0e38a9c5d60e9d
(cherry picked from commit c8bb7fb3acfc65312cacb4b38f0a7ba62810046a)
 2025-09-25 17:22:24 +08:00
zhimin.zeng
554ce5004c FIX: fix the error display of default k value 
jira: STUDIO-12546
Change-Id: Ibb674de256c306123c1ab7761945eda18704fe0e
(cherry picked from commit d3174f35d81654a36a85194b94c2cec1ee263ded)
 2025-09-25 09:19:02 +08:00
xin.zhang
4b6b3cc7bd FIX: the encoding of filament check_ams_filament_valid 
jira: [STUDIO-12251]
Change-Id: Idc3d23dce67d3e835f15c47984fdd68041371d61
(cherry picked from commit 42b15b4d41a099c5f1aca9dd59ac592aafba0b43)
 2025-09-24 11:14:42 +08:00
xin.zhang
6d5dca8961 FIX: the text encoding problem 
jira: [STUDIO-12251]
Change-Id: Ie485eaad3fac8a9f0aa84d4f2ff85708a3c984b5
(cherry picked from commit 7a054c7618851af6f4360a3df5f4415dc138f482)
 2025-09-24 09:41:33 +08:00
tao wang
465f634988 FIX:use the correct method to update the dark mode of the window 
jira:[STUDIO-11511]

Change-Id: Ie359e391e3d511729b4a777376b89e5bceda161c
(cherry picked from commit bdc864bf10dcfe2738e2476025aac35c007f67a1)
 2025-09-23 17:11:58 +08:00
xin.zhang
a650db2903 FIX: disable filament editing if printing 
jira: [STUDIO-12153]
Change-Id: I2397360439d5baaf673c9fc306f3b08eb068cfec
(cherry picked from commit 8308fe3964f72cd911ac472923e8b27b0b3f9c61)
 2025-09-23 16:38:50 +08:00
zhimin.zeng
119f16c565 ENH: add filament_printable and delete unprintable and printable list 
jira: none

Change-Id: I643ab11831ceac1fe0793510f64b288cbd16415a
(cherry picked from commit 3dd5a601547485bfcc4188727343a52c30bb6a73)
 2025-09-21 13:48:08 +08:00
maosheng.wei
6aa49dcc12 FIX: Material name transcoding issue in AMS Materials Setting 
github: #6190

Change-Id: Ie43cf9ab9b59b0cb9e7b03a61601716f6fff2217
(cherry picked from commit 33193459219c7b39a2cd0ee1dfc8c57e39cfa755)
 2025-09-20 15:37:16 +08:00
xin.zhang
98c82d6be6 FIX: try optimize the material settings refreshing 
jira: [STUDIO-11086]
Change-Id: I610304a7aa4a1b23e1e3fe7def157a93f5ae19af
(cherry picked from commit 6eff893be393ad73a74bb41414c0d1aab4d4c6f3)
 2025-09-18 17:05:16 +08:00
zhimin.zeng
b9ad057d1a FIX: Delete the cali tips 
original patch 485e961e9520a77d1d25e97598f6a1648a50a976
jira: STUDIO-10945

Change-Id: I7524d2c0f74d97ea86e1516a6596b63345a36661
(cherry picked from commit e6e412479f904f5b75ed3bbb5e1bdd82a2c5d0b1)
 2025-09-18 16:17:50 +08:00
xin.zhang
3e2fe6306b ENH: use dialog style 
jira: [STUDIO-10944]
Change-Id: If48abb7bccbc8c909c2a659d96f0155d97cce673
(cherry picked from commit 196c72228768c1563343b4fdd443af5760272821)
 2025-09-18 16:11:17 +08:00
zhimin.zeng
9d3d0b4c4d ENH: add k value tips for cali 
jira: none
Change-Id: I73f997ea4843d52a6dce3fac905f42779beb54c2
(cherry picked from commit 06a50c35fe5f8c84403265f4cfd813f946966911)
 2025-09-18 15:22:55 +08:00
zhimin.zeng
9738be3e58 FIX: Link Chinese wiki in Chinese environment 
jira: STUDIO-10795
Change-Id: I50454a0e4e3f4b6ab8a1d2be8f2dbc4343c6a3e6
(cherry picked from commit a25e7198eec188bf5262f262ca6a100ad56293d4)
 2025-09-18 11:07:28 +08:00
tao wang
35bb239a8f ENH:support checking blacklists for specified models 
jira:[none]

Change-Id: Icd88c478a04e8743cdaaa8d670f238b534e40283
(cherry picked from commit c3643fdec9c0fcbceeba71f9ef5cd2de0cf7957d)
 2025-09-17 17:38:52 +08:00
tao wang
1241b66dfc ENH:fixed incorrect prompt for glow material 
jira:[STUDIO-10574]

Change-Id: I4475eb527ffbc8cc6d72405445552971d062b45e
(cherry picked from commit 01918affdfb69879f86ca47fe2f1ab8af5e1311b)
 2025-09-17 17:09:21 +08:00
zhimin.zeng
e2a9aecb22 FIX: new printer do not display the default k value 
jira: none
Change-Id: I1da6fa4cf800152b2d754e69a8226afae44d18c0
(cherry picked from commit 996f2995039729c62709e50dc88ddba4208bac84)
 2025-09-17 15:10:42 +08:00
zhimin.zeng
ad0f9b5e5a FIX: pa default item add filament_id 
jira: none
Change-Id: Icfc24390e62cc1eca7e670311dc88502cea16fd7
(cherry picked from commit fb72d19a44d3b916920373acb7dd359282c1b750)
 2025-09-17 15:09:51 +08:00
tao wang
18ffc5497b NEW:added inspection of pla-glow material 
jira:[none]

Change-Id: I1a62992e24665b83f54981e59edc1ba1fcda9a8a
(cherry picked from commit fa2fc22f3e648c0f0f485d1a7e701658693da457)
 2025-09-17 11:16:10 +08:00
zhimin.zeng
1364a38504 FIX: fix some size error on dpi changed 
jira: TUDIO-10053
Change-Id: Icd93aa0dd9a2c693d7b957f9ede5c6dafc415352
(cherry picked from commit ce65273dc0fc9bc3f23dc54b01e4dcc92d92483c)
 2025-09-16 21:21:40 +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
xin.zhang
b5dc52b00e FIX: sort the filament names 
jira: [STUDIO-9825]
Change-Id: I29a313db9a012124888357008afea1ddba39a3e5
(cherry picked from commit 1a676645eb522821428cc3167bfb8ac43277e330)
 2025-09-10 10:07:22 +08:00
xin.zhang
09a8ccaa18 FIX: always show select nozzle type notice 
jira: [STUDIO-9151]
Change-Id: I432beaa11c0a776ca214cbfc675227f95837b426
(cherry picked from commit 6587ac01b83268982a049b5ac0c45f8aac2b3f5d)
 2025-09-06 21:36:28 +08:00
xin.zhang
8fb9cc2ee8 FIX:revise the size and alignment of GUI label 
jira: [STUDIO-9215]

Change-Id: I0e3989644a6edb8d33bcc248fcf2a8d4d98efbe6
(cherry picked from commit 5b13591c9d47a530c76af884975d3b91bf595260)
 2025-09-05 17:59:04 +08:00
zhimin.zeng
37ff918ea9 FIX: modify the name of high flow 
jira: none
Change-Id: Icd1a0ac91e957fc38a6f072b1bb3af0c97be398e
(cherry picked from commit ea0691f092755d7e68db3ecf8b46b0e86a8fadb2)
 2025-08-24 23:18:28 +08:00
zhimin.zeng
1e6a186e2b ENH: support auto pa cali for multi_extruder printer 
jira: none
Change-Id: I835a0e20de81f9af7c40983e00bdb37ea6c95a68
(cherry picked from commit 4e387d4ace4332a7c2b6c0ab695b80a51597d0c7)
 2025-08-24 23:18:27 +08:00
zhimin.zeng
e8d77ddb58 FIX: show k value when select default pa profile 
jira: STUDIO-8540
Change-Id: I1c92628fa888f935762d31968237e28d65594e51
(cherry picked from commit 3f791574cd5ae384ee295e595f35d45c78ac719f)
 2025-08-24 23:18:25 +08:00
Noisyfox
1b55440b15 Fix compile 2025-08-24 23:18:23 +08:00
zhimin.zeng
64a2199733 FIX: Add a matching rule with the same name for PA value 
jira: 8339
Change-Id: I134139fd8cff9cb47b29523e90d5dd4f2667c387
(cherry picked from commit 489285c9b89bdd21812c5e7429263fb28fd30f20)
 2025-08-24 23:18:23 +08:00
zhimin.zeng
d841b2d178 FIX: Add a matching rule with the same name for PA value 
jira: 8339
Change-Id: Ib11be988a8e3cdbcaa853627cb946446730062c4
(cherry picked from commit f4379b3e193ac6d30b8ee91b5c3ff5518aec1f31)
 2025-08-24 23:18:23 +08:00
zhimin.zeng
22d00f89b0 ENH: add tpu check for send print and cali 
jira: 8234
Change-Id: I5706071d900079477abc9558461811a8d85fb0ab
(cherry picked from commit f0d2ad3dbe2e29548a8b3621a863cd38b543b6b4)
 2025-08-24 23:18:17 +08:00
tao wang
b46b69ebad NEW:support new ext slot mapping 
jira:[support new mapping]

Change-Id: Iaf88f7bd57177df772a926ad162bd3b5a141327a
(cherry picked from commit 3b93bd2dd305026457e9f63ca3faeb153b59c9a5)
 2025-08-24 23:18:00 +08:00
Noisyfox
65936b34c1 Fix crash when using old firmware 2025-05-24 18:37:35 +08:00
Noisyfox
fe0f6497ad Fix external filament calib 2025-05-07 21:31:42 +08:00
tao wang
406ccadd06 ENH:use the correct trayID 
jira[STUDIO-11274]

Change-Id: I0025bb74002b00c448fd4a499e547a5fbd35537f
(cherry picked from commit 937f687169091982bc6f11c5e76fb823b0456590)
 2025-05-07 18:45:18 +08:00
tao wang
48ec9edc51 ENH:command ams filament settings is compatible with all AMS 
jira:[none]

Change-Id: I622300794d1fa14826847229737b1f6f2ae490db
(cherry picked from commit c2adbe140b134b958f589ba178286e245a09adbf)
 2025-05-07 18:13:03 +08:00