Compare commits

..

1288 Commits

Author SHA1 Message Date
SoftFever
a636df63c1 bump version to 1.6.3 2023-05-28 10:51:25 +08:00
SoftFever
48a7e73fe7 Tweak default settings for Qidi: turn off ironing by default and turn arc fitting for 3 serials 2023-05-28 10:48:34 +08:00
Cyril Guislain
35e75b9824 Update French Translation / Add missing translation strings (#1153)
Update French Translation / Add missing strings
2023-05-28 10:46:42 +08:00
SoftFever
fb6d5e5547 add run_gettext.bat for Windows 2023-05-28 09:55:05 +08:00
SoftFever
c942447f7f Add back missing printer cover photos 2023-05-27 19:43:44 +08:00
SoftFever
da73688e76 Add more PrusaSlicer compatible placeholder #1142 #1148 2023-05-27 19:38:14 +08:00
SoftFever
1ab212512e 1. Add run_gettext.sh
2. Update locale
2023-05-27 19:08:42 +08:00
SoftFever
8b0e307941 infill_anchor #500 #136 2023-05-27 17:39:48 +08:00
SoftFever
aa4704a6db Decrease default PETG temp for temp tower test #1117 2023-05-27 10:17:49 +08:00
fr3ak2402
cf4df922bf fix BIQU Profiles (#1147) 2023-05-27 09:07:29 +08:00
SoftFever
2f34ddb524 Fixed an issue that project file(.3mf) can't be loaded if plate name contains illegal characters like & #1141 2023-05-26 23:43:34 +08:00
SoftFever
442c232323 Skip checking Repetier server name #1116 2023-05-24 00:27:29 +08:00
SoftFever
ab5e7f7de8 tiny code clean up for Improve bridge_density commit 2023-05-22 21:14:11 +08:00
SoftFever
fe6ce5e28a Improve bridge_density #1043 2023-05-22 20:35:20 +08:00
YGK3D
9b7d72584c Update RRF start script for Vivedino Troodon 2.0 (#1104)
* Added profiles for Vivedino Troodon 2.0

* Added printer images for Vivedino Troodon 2.0

* Delete Troodon 2.0 - Klipper_cover.png

* Delete Troodon 2.0 - RRF_cover.png

* Move printer images to vendor folder

* Update RRF start script
2023-05-21 11:41:57 +08:00
Tyler Cushing
64a55a4fbe Update fdm_filament_common.json (#1103)
Set default filament diameter to 1.75mm.
2023-05-21 09:55:43 +08:00
fr3ak2402
7809fabcbf add Raise3D printer profiles (#1087)
* add Raise3D printer profiles

Raise3D Pro3
Raise3D Pro3 Plus

* add more Sovol profiles

Sovol SV06
Sovol SV06 Plus

* Add & modify Anycubic profiles

Anycubic Chiron
Anycubic Kobra Max

Anycubic Vyper process 0.15mm & 0.30mm
2023-05-20 19:33:16 +08:00
Musicdad
8d96c42a3e Add Folgertech Printers (#1048)
Profiles for Folgertech Printers includes i3, FT-5, FT-6


Co-authored-by: Musicdad12 <seanmccallister12@gmail.com>
2023-05-20 19:32:06 +08:00
Heiko Liebscher
2d92d2f4e1 de fix translation #1057 (#1078)
* de-fix for new features

* fix de translation #1057
2023-05-20 16:20:52 +08:00
SoftFever
b3daa514fa README: track status badge of main branch 2023-05-15 08:05:19 +08:00
SoftFever
9bd6fed379 update WIKI 2023-05-15 00:07:56 +08:00
SoftFever
914aff54f7 fix a typo in OrcaSlicer_en.po 2023-05-14 22:11:11 +08:00
SoftFever
f2dfadeb64 trigger build for locale/resource changes 2023-05-14 21:29:51 +08:00
SoftFever
c0c8ea95ca update cn translation 2023-05-14 21:23:34 +08:00
fr3ak2402
e6f3427bb9 add Anycubic Vyper profile (#1062) 2023-05-14 21:10:55 +08:00
Heiko Liebscher
ff455c6dc4 de-fix for new features (#1059) 2023-05-14 21:10:05 +08:00
SoftFever
dfe3c15f7c update wiki test 2023-05-14 18:18:20 +08:00
SoftFever
45d2369cac Merge remote-tracking branch 'origin/PublishDocsToWiki' 2023-05-14 16:35:18 +08:00
SoftFever
90ab9bd893 Update workflow 2023-05-14 16:27:23 +08:00
SoftFever
7fc16d8774 Update locale
1. include PhysicalPrinterDialog.cpp in the list.txt
2. Update Chinese translation
3. Add handy models to the translation list
2023-05-14 12:50:43 +08:00
fr3ak2402
37e105c1e8 Improvement Artillery Sidewinder X2 Profile & other small changes (#1053)
* Add & revise FLSun Profile

FLSun Q5
FLSun QQ-S Pro

* Patch Artillery Sidewinder X2 profile

revision speed parameters
revision start & end code

* change Anycubic 4Max Pro image

* Adjustments to the profile of the Anycubic 4Max Pro

Preparation for adding more Anycubic printers

* add more Anycubic profiles
2023-05-14 09:18:02 +08:00
SoftFever
938d25ef50 Fixed an issue that Orcaslicer didn't jumping to device tab after sending job #520 #567 #1044 #1047 2023-05-14 00:31:31 +08:00
SoftFever
56f8552dab tweak tol model 2023-05-14 00:28:49 +08:00
SoftFever
cf8c6e22bd Orca Tolerance Test 2023-05-13 18:22:55 +08:00
YGK3D
951293c642 Add printer profiles for Vivedino Troodon 2.0 (#1041)
* Added profiles for Vivedino Troodon 2.0

* Added printer images for Vivedino Troodon 2.0

* Delete Troodon 2.0 - Klipper_cover.png

* Delete Troodon 2.0 - RRF_cover.png

* Move printer images to vendor folder
2023-05-12 23:31:24 +08:00
fr3ak2402
7bf453ab0f Add & revise FLSun Profile (#1045)
* Add & revise FLSun Profile

FLSun Q5
FLSun QQ-S Pro

* change FLSun V400 printer image
2023-05-12 23:26:06 +08:00
SoftFever
51de2debb3 optimized M106 command
write down integer number instead of float
2023-05-12 23:12:50 +08:00
fr3ak2402
507db8c301 add more printer profiles (#1038)
* Delete SW-x2.png

* Add Artillery Sidewinder X1 profile

* add Elegoo Neptune profile

* Update Elegoo Neptune 2S 0.4 nozzle.json

* Change start code parameters
2023-05-12 18:45:14 +08:00
Scott Mudge
e23b600239 Fix build warnings, update deprecated boost headers (#1035)
Fix build warnings, update deprecated boost headers.
2023-05-11 23:46:15 +08:00
fr3ak2402
2e2ea807a6 add BIQU Printer images (#1028) 2023-05-11 07:34:17 +08:00
SoftFever
08a94681ca minor change: use [bed_temperature_initial_layer_single] instead of [hot_plate_temp_initial_layer] for some profiles 2023-05-10 22:48:12 +08:00
SoftFever
79a43da863 minor changes
1. when default hotend model
2. apply speed change for current path
2023-05-10 22:32:51 +08:00
SoftFever
35f8dba5ab fine tune retraction test 2023-05-10 22:32:51 +08:00
Musicdad
c9fcc421c9 Add support for BIQU Printers (#1024)
* Add support for BIQU Printers

Adds printers BIQU B1, BX, and Hurakan

* Requested changes made to profiles

---------

Co-authored-by: Musicdad12 <seanmccallister12@gmail.com>
2023-05-10 22:32:20 +08:00
fr3ak2402
382dd9b4c2 Start code correction for Creality, Voxelab, Sovol & Elegoo printers (#1021)
* Adding more Elegoo printer profiles

Elegoo Neptune X
Elegoo Neptune 2
Elegoo Neptune 2S
Elegoo Neptune 2D

* add ultimaker 2 profile

* Error corrections in the G-code

Error Correction of the start codes, so that no error message appears any more.

* Change G-Code Parameter
2023-05-10 22:28:10 +08:00
fr3ak2402
ef370bf6f1 Add Ultimaker 2 profile (#1003)
* Adding more Elegoo printer profiles

Elegoo Neptune X
Elegoo Neptune 2
Elegoo Neptune 2S
Elegoo Neptune 2D

* add ultimaker 2 profile
2023-05-09 20:51:30 +08:00
Mike Constantino
aeb2b0e41d Fix acceleration being set when disabled in PA line calibration (#1011)
Update GCode.cpp

Fixed issue where acceleration was being set on PA line calibration even when disabled in settings
2023-05-09 20:50:08 +08:00
Heiko Liebscher
dedd900be4 lang fix (#1012)
next fix
2023-05-09 20:49:39 +08:00
Xander Forge
692350a214 Fix mistake in "0.28mm Extra Draft @MyKlipper.json" (#1013) 2023-05-09 20:47:29 +08:00
Heiko Liebscher
00b172f4c6 fix pot and lang after PR (#1001) 2023-05-08 23:07:42 +08:00
Scott Mudge
6875e2aac5 Fixed double-label for fan speed-up time, fixed label to include hyphen (#996)
Fixed double-label for fan speed-up time, fixed label to include hyphen.
2023-05-08 23:06:18 +08:00
Scott Mudge
884041960e Fixed double-label for fan speed-up time, fixed label to include hyphen (#996)
Fixed double-label for fan speed-up time, fixed label to include hyphen.
2023-05-08 22:24:39 +08:00
fr3ak2402
73e14c90ea Adding more Elegoo printer profiles (#993)
Elegoo Neptune X
Elegoo Neptune 2
Elegoo Neptune 2S
Elegoo Neptune 2D
2023-05-08 22:23:45 +08:00
SoftFever
c81ca8c9d7 profile cover image reorg 2023-05-07 23:52:11 +08:00
SoftFever
c9b20a0e10 fix a regression in layer time(log) view 2023-05-07 23:52:11 +08:00
SoftFever
da90e22b9f Support interface fan speed 2023-05-07 23:52:11 +08:00
SoftFever
be4373583f Number of slow layers #796 2023-05-07 23:52:11 +08:00
SoftFever
117cda00bc improve retraction tower model 2023-05-07 23:52:11 +08:00
SoftFever
7d122fb479 support full_fan_speed_layer 2023-05-07 23:52:11 +08:00
SoftFever
ef83e47612 Fix a regression: Generic filament profiles conflicts #981 2023-05-07 23:52:11 +08:00
SoftFever
3d6b59b904 Uncheck print number for PA tower #975 2023-05-07 23:52:11 +08:00
SoftFever
0d5a1c7dd2 fix missing default 3d hotend model #976 2023-05-07 23:52:11 +08:00
SoftFever
99230aabac Calibration: retraction test 2023-05-07 23:52:11 +08:00
fr3ak2402
a14943665b Revise and add new Creality profiles & Fix SecKit Filaments (#974)
* Revise and add new Creality profiles

* Correction of SecKit filaments

* Add Creality Ender-3 S1 Pro Profile & change snapmaker printer images

* Revision of the printer Creality & SecKit Printer ID
2023-05-07 22:50:18 +08:00
Heiko Liebscher
cd9ca51035 Fix german hotkey #950 (#984)
* fix empty label

* many typos fixed

* Magic Hotkey fix

* Typo in initial Setup Wizard #982
2023-05-07 22:00:00 +08:00
SoftFever
4807b9d1b6 Fix an issue that OrcaSlicer can't open previously generated gcode/.3mf file #712 #958 2023-05-06 20:13:58 +08:00
SoftFever
52d6dc71eb update gitignore 2023-05-06 18:12:20 +08:00
SoftFever
a2204b5af6 Improve bridging for one top perimeter when classical wall generator is used. 2023-05-06 13:46:06 +08:00
SoftFever
005038427a remove duplicated bridge_angle 2023-05-06 13:46:06 +08:00
Scott Mudge
2e223551e4 Fan Speed Delay + Fan Kickstart Feature (#910)
Initial commit for fan speed delay, required some changes when porting from SuperSlicer.

Co-authored-by: SoftFever <softfeverever@gmail.com>
2023-05-06 13:41:47 +08:00
fr3ak2402
d6290fdbbb Add Sovol printer profiles (#963)
* Adding the Qidi X-Plus

Qidi X-Plus profile
Qidi X-Plus image

* Revision of the pressure plate model

Qidi X-Plus

* Add Artillery Profiles

Artillery Genius
Artillery Hornet

* Adds Elepoo Neptune 3 profiles

Elepoo Neptune 3
Elepoo Neptune 3 Pro
Elepoo Neptune 3 Plus
Elepoo Neptune 3 Max

* Revision of the Qidi profiles

Adjustments of the speeds:
Qidi X-Plus
Qidi X-Max
Qidi X-CF Pro

* Revision of the Qidi profiles

Qidi X-Smart 3
Qidi X-Plus 3
Qidi X-Max 3

* Add Voxelab Aquila X2 Profile

* Revision of the Voxelab Processes

Changing the Aquila X2 process names

* Acceleration adjustment Voxelab

Voxelab Aquila X2

* Adjustment of the printing area

* Add Sovol printer profiles
2023-05-05 23:16:41 +08:00
SoftFever
244aa466f9 update cicd 2023-05-05 23:08:36 +08:00
Scott Mudge
a4b4ce0ff7 Dependency Update: add support for Visual Studio 2022, update Boost to 1.78, improve wxWidgets patch (#911)
* Changed wxWidgets to use forked version with patch applied to 3.1.5, rather than patching at build. Updated boost to 1.78 for VS2022 support, and fixed boost compat issue.

* Boost update to 1.78 only for Windows, fixed wxWidgets re-patching issue for Windows, corrected wxWidgets webview nuget hash.

---------

Co-authored-by: SoftFever <softfeverever@gmail.com>
2023-05-05 23:01:10 +08:00
fr3ak2402
f6741a933f Add Voxelab Aquila X2 Profile (#956)
* Adding the Qidi X-Plus

Qidi X-Plus profile
Qidi X-Plus image

* Revision of the pressure plate model

Qidi X-Plus

* Add Artillery Profiles

Artillery Genius
Artillery Hornet

* Adds Elepoo Neptune 3 profiles

Elepoo Neptune 3
Elepoo Neptune 3 Pro
Elepoo Neptune 3 Plus
Elepoo Neptune 3 Max

* Revision of the Qidi profiles

Adjustments of the speeds:
Qidi X-Plus
Qidi X-Max
Qidi X-CF Pro

* Revision of the Qidi profiles

Qidi X-Smart 3
Qidi X-Plus 3
Qidi X-Max 3

* Add Voxelab Aquila X2 Profile

* Revision of the Voxelab Processes

Changing the Aquila X2 process names

* Acceleration adjustment Voxelab

Voxelab Aquila X2

* Adjustment of the printing area
2023-05-05 21:10:04 +08:00
jonkers71
b5829b4556 New Seckit Profile. (#943)
* Added SK-Go3 profile and supporting resources.

* Moved .stl location

* wrong location removed.

* Changed filament settings as SK-Go3 was not set.

* Changed setting_id as requested.
2023-05-05 21:08:53 +08:00
Dylan
4481fe62b5 Add a new placehoder is_extruder_used for IDEX printers (#951)
* add placeholder 'is_extruder_used' for IDEX

* fix code_font using fixed-width font

* fix cmd+shift+g
2023-05-04 22:18:44 +08:00
fr3ak2402
d192a8cc61 Revision of the Qidi Profiles (#940)
* Adding the Qidi X-Plus

Qidi X-Plus profile
Qidi X-Plus image

* Revision of the pressure plate model

Qidi X-Plus

* Add Artillery Profiles

Artillery Genius
Artillery Hornet

* Adds Elepoo Neptune 3 profiles

Elepoo Neptune 3
Elepoo Neptune 3 Pro
Elepoo Neptune 3 Plus
Elepoo Neptune 3 Max

* Revision of the Qidi profiles

Adjustments of the speeds:
Qidi X-Plus
Qidi X-Max
Qidi X-CF Pro

* Revision of the Qidi profiles

Qidi X-Smart 3
Qidi X-Plus 3
Qidi X-Max 3
2023-05-04 20:29:55 +08:00
SoftFever
b9e127afd1 Fix regressions in calibrations after merging upstream changes #930 2023-05-04 20:17:07 +08:00
fr3ak2402
1b2bdd40ac Adds printer profiles for Elegoo printers (#937)
* Adding the Qidi X-Plus

Qidi X-Plus profile
Qidi X-Plus image

* Revision of the pressure plate model

Qidi X-Plus

* Add Artillery Profiles

Artillery Genius
Artillery Hornet

* Adds Elepoo Neptune 3 profiles

Elepoo Neptune 3
Elepoo Neptune 3 Pro
Elepoo Neptune 3 Plus
Elepoo Neptune 3 Max
2023-05-03 21:29:59 +08:00
fr3ak2402
93eff233d5 Adds printer profile for Artillery printers (#923)
* Adding the Qidi X-Plus

Qidi X-Plus profile
Qidi X-Plus image

* Revision of the pressure plate model

Qidi X-Plus

* Add Artillery Profiles

Artillery Genius
Artillery Hornet
2023-05-03 21:11:10 +08:00
Heiko Liebscher
4ba3dbabc8 fix 2 script windows (#926)
* fix 2 script windows

* fix #928
2023-05-03 20:57:38 +08:00
SoftFever
0d9b2167cd Fix thumbnail background 2023-05-02 22:25:29 +08:00
SoftFever
c60669b293 User definable retraction length for filament change #903 2023-05-02 22:25:29 +08:00
fr3ak2402
774c0bc1ad Adds printer profile for Qidi X-Plus printer (#915)
* Adding the Qidi X-Plus

Qidi X-Plus profile
Qidi X-Plus image

* Revision of the pressure plate model

Qidi X-Plus
2023-05-02 22:18:38 +08:00
Heiko Liebscher
1463f1ae9e fix German after big update (#916) 2023-05-02 22:17:46 +08:00
SoftFever
c413a5945f Update French Translation (#914)
In this PR :

- Updated French translation
- Re-added missing translation strings removed by commit e60dc9a
2023-05-01 23:01:34 +08:00
Cyril
c9431bdf2b Update French Translation 2023-05-01 13:07:06 +02:00
SoftFever
ad3a8e766b Merge pull request #896 from fr3ak2402/main
Adds and corrects printer profiles for Qidi printers
2023-05-01 14:08:51 +08:00
SoftFever
54c02521d4 Merge branch 'master-remote' 01.06.00.66
# Conflicts:
#	.github/workflows/build_ubuntu.yml
#	bbl/i18n/OrcaSlicer.pot
#	bbl/i18n/de/OrcaSlicer_de.po
#	bbl/i18n/en/OrcaSlicer_en.po
#	bbl/i18n/es/OrcaSlicer_es.po
#	bbl/i18n/fr/OrcaSlicer_fr.po
#	bbl/i18n/hu/OrcaSlicer_hu.po
#	bbl/i18n/it/OrcaSlicer_it.po
#	bbl/i18n/ja/OrcaSlicer_ja.po
#	bbl/i18n/nl/OrcaSlicer_nl.po
#	bbl/i18n/sv/OrcaSlicer_sv.po
#	bbl/i18n/zh_cn/OrcaSlicer_zh_CN.po
#	resources/i18n/zh_cn/BambuStudio.mo
#	version.inc
2023-05-01 10:21:08 +08:00
fr3ak2402
c81b658cc5 Delete resources/profiles/UltiMaker directory 2023-04-30 14:40:57 +02:00
fr3ak2402
3574bb4638 Delete UltiMaker.json 2023-04-30 14:40:42 +02:00
fr3ak2402
bb8a0a15f4 Delete UltiMaker 2_cover.png 2023-04-30 14:40:13 +02:00
fr3ak2402
71e1bfe9dc Adding the Ultimaker 2 image 2023-04-30 14:15:43 +02:00
fr3ak2402
cc02286963 Adding the Ultimaker 2 profile 2023-04-30 14:14:51 +02:00
fr3ak2402
e266b32b05 Add and revise Qidi printer
Add Qidi X-Max
Add Qidi X-CF Pro

Revise Start & End Code from X-Smart3, X-Plus3, X-Max3
2023-04-30 09:27:35 +02:00
fr3ak2402
6e7f456452 Merge branch 'SoftFever:main' into main 2023-04-30 09:24:59 +02:00
fr3ak2402
3c86c53787 Add more Qidi printer images
Qidi X-Max
Qidi X-CF-Pro
2023-04-30 09:24:51 +02:00
SoftFever
e60dc9afa2 update po file(tied my best... 2023-04-29 20:38:00 +08:00
SoftFever
1a4f028f32 Merge branch 'SoftFever'
# Conflicts:
#	bbl/i18n/OrcaSlicer.pot
#	bbl/i18n/cs/OrcaSlicer_cs.po
#	bbl/i18n/de/OrcaSlicer_de.po
#	bbl/i18n/en/OrcaSlicer_en.po
#	bbl/i18n/es/OrcaSlicer_es.po
#	bbl/i18n/fr/OrcaSlicer_fr.po
#	bbl/i18n/hu/OrcaSlicer_hu.po
#	bbl/i18n/it/OrcaSlicer_it.po
#	bbl/i18n/ja/OrcaSlicer_ja.po
#	bbl/i18n/nl/OrcaSlicer_nl.po
#	bbl/i18n/sv/OrcaSlicer_sv.po
#	bbl/i18n/zh_cn/OrcaSlicer_zh_CN.po
#	version.inc
2023-04-29 20:13:03 +08:00
SoftFever
9304f2016a update wiki 2023-04-29 18:37:01 +08:00
SoftFever
b971e8a73f Update README.md 2023-04-29 18:25:05 +08:00
SoftFever
5f9fe826f0 Merge pull request #838 from chrisribe/PublishDocsToWiki
Publish docs to wiki
2023-04-29 18:16:26 +08:00
SoftFever
2b00228c75 fix thumbnail camera 2023-04-29 16:56:03 +08:00
SoftFever
164c06c1b1 regen po 2023-04-29 15:50:16 +08:00
SoftFever
20195c854b change to multi-plate friendly bed model for Flsun V400 2023-04-29 10:30:43 +08:00
SoftFever
ae2cf4960d fix typo 2023-04-29 10:30:42 +08:00
SoftFever
96eef40baf Merge pull request #873 from fr3ak2402/main
Add Qidi Printer Profiles
2023-04-29 10:30:42 +08:00
SoftFever
f2bd35ed90 Merge pull request #858 from scottmudge/sk-tank-profile
Added profile for SecKit SK-Tank
2023-04-29 10:30:42 +08:00
SoftFever
d13f27e06a Merge pull request #871 from EmanueleGiannuzzi/main
Original PrusaSlicer gradient for GCodeViewer
2023-04-29 10:30:42 +08:00
fr3ak2402
0f3e550c09 Revised printing plate model for all Qidi printers
The margins were made narrower, so that there is more space to the plate title.
2023-04-29 10:30:41 +08:00
SoftFever
62fb261636 Merge pull request #872 from hliebscher/fix-new-de.po
Fix new de.po
2023-04-29 10:30:41 +08:00
fr3ak2402
40c8b12b10 Delete qidi_xsmart3_buildplate_model.stl 2023-04-29 10:30:41 +08:00
fr3ak2402
ae79ec9979 Delete qidi_xmax3_buildplate_model.stl 2023-04-29 10:30:41 +08:00
fr3ak2402
2e532ef2c8 Delete qidi_xplus3_buildplate_model.stl 2023-04-29 10:30:41 +08:00
fr3ak2402
426a5f4932 Revised Qidi Filaments
Removal of standard filament color from all Qidi filaments
2023-04-29 10:30:41 +08:00
fr3ak2402
cfcbfead91 Adding the Qidi Printer Profiles
Revised Qidi Filament Profile
Adding a printing plate model
Revision of the printing plates texture
Revision of the Qidi printer family
2023-04-29 10:30:41 +08:00
Scott Mudge
3267ce73d1 Added profile for SecKit SK-Tank 2023-04-29 10:30:40 +08:00
fr3ak2402
bb624f003b Adding the Qidi printer images
Revision of the printer size on the whole image
2023-04-29 10:30:40 +08:00
SoftFever
8686d434f6 Revert "Merge pull request #868 from fr3ak2402/main"
This reverts commit 3ee801be50, reversing
changes made to bbbed5e8c3.
2023-04-29 10:30:32 +08:00
Heiko Liebscher
7ce404d449 fix mo 2023-04-29 10:30:32 +08:00
SoftFever
28de6c5999 update locale 2023-04-29 10:30:32 +08:00
Heiko Liebscher
787e6a6295 fig new msgid 2023-04-29 10:30:32 +08:00
SoftFever
f3b456e42b Merge pull request #868 from fr3ak2402/main
Adds printer profiles for Qidi printers
2023-04-29 10:30:31 +08:00
SoftFever
ef9fcac29d Merge pull request #866 from Guilouz/main
Updated Translation / Fixed Dark Mode in Machine Tab
2023-04-29 10:30:31 +08:00
fr3ak2402
7cc0cc9381 Merge branch 'SoftFever:main' into main 2023-04-29 10:30:31 +08:00
fr3ak2402
04c9a22f7a Changing the Qidi Printer X-SeriesHortend model 2023-04-29 10:30:31 +08:00
fr3ak2402
04a7aa5dbf change images size (Qidi X-Smart 3)
from 512x512 to 180x180
2023-04-29 10:30:31 +08:00
fr3ak2402
331458f6ef Change the Qidi printer images size
from 512x512 to 180x180
2023-04-29 10:30:30 +08:00
fr3ak2402
51be052388 Merge branch 'SoftFever:main' into main 2023-04-29 10:30:30 +08:00
fr3ak2402
3cf0a8c55a Adjustment of the Build Plate of X-Plus 3 2023-04-29 10:30:30 +08:00
fr3ak2402
916fbf8488 Change Qidi X-Max 3 bed_texture file
Corrected Bed Size Labelling
2023-04-29 10:30:30 +08:00
fr3ak2402
4d37d87a3f Delete qidi_buildplate_xmax3.png 2023-04-29 10:30:30 +08:00
fr3ak2402
d90a73b3a9 Delete qidi_buildplate_xsmart3.png 2023-04-29 10:30:30 +08:00
fr3ak2402
d29435507c Delete qidi_buildplate_xplus3.png 2023-04-29 10:30:29 +08:00
fr3ak2402
930494c5d3 Update Qidi printer profiles
Add 0.12. 0.16, 0.25. 0.30 processes

Change bed_textures from png-files to sig-files
2023-04-29 10:30:29 +08:00
fr3ak2402
8d149e45dc Update Qidi JSON 2023-04-29 10:30:29 +08:00
fr3ak2402
3983c10871 Delete Qidi.json 2023-04-29 10:30:29 +08:00
fr3ak2402
5c1f3c3194 Update Qidi JSON 2023-04-29 10:30:29 +08:00
fr3ak2402
12cf7f7637 Delete Qidi.json 2023-04-29 10:30:29 +08:00
fr3ak2402
5edb7bd275 Upload new images for Qidi printers 2023-04-29 10:30:29 +08:00
fr3ak2402
8eb06ae936 Delete Qidi Tech X-CF Pro_cover.png 2023-04-29 10:30:29 +08:00
fr3ak2402
969657f0f0 Delete Qidi Tech X-Max 3_cover.png 2023-04-29 10:30:29 +08:00
fr3ak2402
3df3be898e Delete Qidi Tech X-Max_cover.png 2023-04-29 10:30:28 +08:00
fr3ak2402
2de64aed15 Delete Qidi Tech X-Plus 3_cover.png 2023-04-29 10:30:28 +08:00
fr3ak2402
b2dd68af92 Delete Qidi Tech X-Smart 3_cover.png 2023-04-29 10:30:28 +08:00
fr3ak2402
c62aab459b Change Qidi printer profiles
Recording the profile from the X-Plus3.
Adjusting the names so that all names begin with Qidi.
Adding the Build Plates .
2023-04-29 10:30:28 +08:00
fr3ak2402
0f1526230e Delete Qidi Tech.json 2023-04-29 10:30:28 +08:00
fr3ak2402
4782427aa1 Delete resources/profiles/Qidi Tech directory 2023-04-29 10:30:28 +08:00
fr3ak2402
feee22d22a Merge branch 'SoftFever:main' into main 2023-04-29 10:30:28 +08:00
fr3ak2402
6a0a47a93d Changing the Image Size for Qidi Tech Printers 2023-04-29 10:30:27 +08:00
fr3ak2402
de61cad519 Update Qidi Tech Printer Profile
X-Smart 3
X-Plus 3
X-MaX 3
2023-04-29 10:30:27 +08:00
fr3ak2402
cdd1e38808 Adding more Qidi Tech filaments 2023-04-29 10:30:26 +08:00
fr3ak2402
b74abebd50 Adding Qidi Tech printer images
X-Smart 3
X-Plus 3
x-Max 3
2023-04-29 10:30:26 +08:00
fr3ak2402
a12e6bcea7 Delete Qidi Tech X-PLUS3_cover.png 2023-04-29 10:30:26 +08:00
fr3ak2402
73c8cbf026 Delete Qidi Tech X-MAX3_cover.png 2023-04-29 10:30:26 +08:00
fr3ak2402
0d4183f04b Update Qidi Tech profiles 2023-04-29 10:30:26 +08:00
fr3ak2402
3f486338cc Merge branch 'SoftFever:main' into main 2023-04-29 10:30:26 +08:00
SoftFever
404f79242d update po files and bump version to 1.6.2 2023-04-29 10:30:18 +08:00
SoftFever
305ccccfd6 Merge pull request #865 from hliebscher/fix_de_typo
fix some typos
2023-04-29 10:30:18 +08:00
Cyril
4aa0c1f481 Fix indent 2023-04-29 10:30:18 +08:00
Heiko Liebscher
b5cb62581c fix some typos 2023-04-29 10:30:18 +08:00
Cyril
3736fb0d6e Update Translation / Fixed Dark Mode in Machine Tab 2023-04-29 10:30:18 +08:00
SoftFever
ba34bcda76 update workflow 2023-04-29 10:29:02 +08:00
SoftFever
b61c7892f0 tweak "Based on " string 2023-04-29 10:29:02 +08:00
SoftFever
843239a3ec slow down flsun 2023-04-29 10:29:02 +08:00
SoftFever
61bb16334b enable CICD build for PR 2023-04-29 10:29:02 +08:00
SoftFever
2795c5729a Revert "Merge pull request #800 from EmanueleGiannuzzi/PrusaSlicer-gradient"
This reverts commit e18b151cb4, reversing
changes made to bd2ea4ef3b.
2023-04-29 10:29:02 +08:00
SoftFever
c730121fde Merge pull request #800 from EmanueleGiannuzzi/PrusaSlicer-gradient
Original PrusaSlicer gradient for GCodeViewer
2023-04-29 10:29:01 +08:00
SoftFever
0ea2efa767 Merge pull request #839 from TonyK54/Ender5Pro-Profile
Adding Ender 5 Pro
2023-04-29 10:29:01 +08:00
SoftFever
d85654b540 fix some issues in profiles 2023-04-29 10:29:01 +08:00
SoftFever
e6fec51ce2 change to multi-plate friendly bed model for Flsun V400 2023-04-28 21:33:34 +08:00
SoftFever
1bf24c7432 fix typo 2023-04-28 19:58:24 +08:00
SoftFever
411a3ac3b1 Merge pull request #873 from fr3ak2402/main
Add Qidi Printer Profiles
2023-04-28 19:14:11 +08:00
fr3ak2402
704427eff7 Revised printing plate model for all Qidi printers
The margins were made narrower, so that there is more space to the plate title.
2023-04-28 12:13:49 +02:00
fr3ak2402
9bcdfcebbc Delete qidi_xsmart3_buildplate_model.stl 2023-04-28 12:12:24 +02:00
fr3ak2402
e7cb016609 Delete qidi_xmax3_buildplate_model.stl 2023-04-28 12:12:12 +02:00
fr3ak2402
07faf6f9a6 Delete qidi_xplus3_buildplate_model.stl 2023-04-28 12:12:06 +02:00
fr3ak2402
7bcb6c8f76 Revised Qidi Filaments
Removal of standard filament color from all Qidi filaments
2023-04-28 12:08:02 +02:00
SoftFever
18218c9e68 Merge pull request #858 from scottmudge/sk-tank-profile
Added profile for SecKit SK-Tank
2023-04-28 13:59:08 +08:00
SoftFever
2760671967 Merge pull request #871 from EmanueleGiannuzzi/main
Original PrusaSlicer gradient for GCodeViewer
2023-04-28 12:51:15 +08:00
SoftFever
b3b8a002c5 Merge pull request #872 from hliebscher/fix-new-de.po
Fix new de.po
2023-04-28 11:41:50 +08:00
fr3ak2402
41569db0ac Adding the Qidi Printer Profiles
Revised Qidi Filament Profile
Adding a printing plate model
Revision of the printing plates texture
Revision of the Qidi printer family
2023-04-28 01:08:15 +02:00
fr3ak2402
a23f5ba4fc Adding the Qidi printer images
Revision of the printer size on the whole image
2023-04-28 01:05:40 +02:00
Heiko Liebscher
1977f1c5b4 fix mo 2023-04-28 00:15:59 +02:00
Heiko Liebscher
9c224261ab fig new msgid 2023-04-28 00:15:41 +02:00
Jan
cc90ac0b0f Converted float arrays in hex string to be used with "decode_color_to_float_array" method 2023-04-27 22:22:45 +02:00
Scott Mudge
02e2335337 Added profile for SecKit SK-Tank 2023-04-27 16:11:50 -04:00
SoftFever
e87a447479 Revert "Merge pull request #868 from fr3ak2402/main"
This reverts commit 3ee801be50, reversing
changes made to bbbed5e8c3.
2023-04-27 23:11:47 +08:00
SoftFever
4cab3701a1 update locale 2023-04-27 22:32:28 +08:00
SoftFever
3ee801be50 Merge pull request #868 from fr3ak2402/main
Adds printer profiles for Qidi printers
2023-04-27 22:03:00 +08:00
SoftFever
bbbed5e8c3 Merge pull request #866 from Guilouz/main
Updated Translation / Fixed Dark Mode in Machine Tab
2023-04-27 21:48:28 +08:00
fr3ak2402
034c5c4679 Merge branch 'SoftFever:main' into main 2023-04-27 15:05:22 +02:00
fr3ak2402
4586bcfca8 Changing the Qidi Printer X-SeriesHortend model 2023-04-27 15:04:19 +02:00
SoftFever
6751fb0829 Merge pull request #865 from hliebscher/fix_de_typo
fix some typos
2023-04-27 20:38:07 +08:00
Cyril
485d38f57f Fix indent 2023-04-27 12:10:56 +02:00
Cyril
9fb14338f5 Update Translation / Fixed Dark Mode in Machine Tab 2023-04-27 12:06:21 +02:00
fr3ak2402
a8cf57d068 change images size (Qidi X-Smart 3)
from 512x512 to 180x180
2023-04-27 09:52:25 +02:00
fr3ak2402
96f97d4a06 Change the Qidi printer images size
from 512x512 to 180x180
2023-04-27 09:49:28 +02:00
Heiko Liebscher
381b43056b fix some typos 2023-04-27 09:15:24 +02:00
fr3ak2402
e273a35465 Merge branch 'SoftFever:main' into main 2023-04-26 19:15:10 +02:00
SoftFever
8df5b79a6e update po files and bump version to 1.6.2 2023-04-26 22:34:36 +08:00
SoftFever
5245fdc9a7 update workflow 2023-04-26 21:07:02 +08:00
SoftFever
e0f8d9adfb tweak "Based on " string 2023-04-26 21:06:08 +08:00
SoftFever
fb9733c4bc slow down flsun 2023-04-26 21:05:30 +08:00
SoftFever
7d1adc12e4 enable CICD build for PR 2023-04-26 20:32:09 +08:00
SoftFever
ac39fdcb6a Revert "Merge pull request #800 from EmanueleGiannuzzi/PrusaSlicer-gradient"
This reverts commit e18b151cb4, reversing
changes made to bd2ea4ef3b.
2023-04-26 20:28:16 +08:00
SoftFever
ac73fd702f Merge pull request #839 from TonyK54/Ender5Pro-Profile
Adding Ender 5 Pro
2023-04-26 20:09:25 +08:00
fr3ak2402
ac92668752 Adjustment of the Build Plate of X-Plus 3 2023-04-25 23:56:42 +02:00
fr3ak2402
587eaa0399 Change Qidi X-Max 3 bed_texture file
Corrected Bed Size Labelling
2023-04-25 23:54:19 +02:00
fr3ak2402
ea54e3d536 Delete qidi_buildplate_xmax3.png 2023-04-25 23:50:52 +02:00
fr3ak2402
2b05d3aac3 Delete qidi_buildplate_xsmart3.png 2023-04-25 23:50:46 +02:00
fr3ak2402
2dc12c4246 Delete qidi_buildplate_xplus3.png 2023-04-25 23:50:38 +02:00
fr3ak2402
880c29f7e2 Update Qidi printer profiles
Add 0.12. 0.16, 0.25. 0.30 processes

Change bed_textures from png-files to sig-files
2023-04-25 23:49:04 +02:00
fr3ak2402
775a18ec90 Update Qidi JSON 2023-04-25 20:17:20 +02:00
fr3ak2402
4205b0a214 Delete Qidi.json 2023-04-25 20:15:14 +02:00
fr3ak2402
cc2c3fc665 Update Qidi JSON 2023-04-25 20:13:19 +02:00
fr3ak2402
8002b68914 Delete Qidi.json 2023-04-25 20:12:55 +02:00
fr3ak2402
25de9a1177 Upload new images for Qidi printers 2023-04-25 20:00:49 +02:00
fr3ak2402
4d03361e01 Delete Qidi Tech X-CF Pro_cover.png 2023-04-25 20:00:19 +02:00
fr3ak2402
bdb5d1ebfb Delete Qidi Tech X-Max 3_cover.png 2023-04-25 20:00:12 +02:00
fr3ak2402
7cf35442ea Delete Qidi Tech X-Max_cover.png 2023-04-25 20:00:04 +02:00
fr3ak2402
ece02d4d71 Delete Qidi Tech X-Plus 3_cover.png 2023-04-25 19:59:56 +02:00
fr3ak2402
2b1f45431e Delete Qidi Tech X-Smart 3_cover.png 2023-04-25 19:59:43 +02:00
fr3ak2402
11e7498b82 Change Qidi printer profiles
Recording the profile from the X-Plus3.
Adjusting the names so that all names begin with Qidi.
Adding the Build Plates .
2023-04-25 19:41:51 +02:00
fr3ak2402
fd80a70bb7 Delete Qidi Tech.json 2023-04-25 19:39:25 +02:00
fr3ak2402
5c273878af Delete resources/profiles/Qidi Tech directory 2023-04-25 19:39:13 +02:00
fr3ak2402
9d33799c5d Merge branch 'SoftFever:main' into main 2023-04-25 18:26:04 +02:00
fr3ak2402
f87a1753d7 Changing the Image Size for Qidi Tech Printers 2023-04-25 16:13:32 +02:00
fr3ak2402
e2771e67d1 Update Qidi Tech Printer Profile
X-Smart 3
X-Plus 3
X-MaX 3
2023-04-25 15:55:35 +02:00
fr3ak2402
c0afdf16f5 Adding more Qidi Tech filaments 2023-04-25 15:53:25 +02:00
SoftFever
e18b151cb4 Merge pull request #800 from EmanueleGiannuzzi/PrusaSlicer-gradient
Original PrusaSlicer gradient for GCodeViewer
2023-04-25 19:56:57 +08:00
SoftFever
bd2ea4ef3b fix some issues in profiles 2023-04-25 00:14:12 +08:00
fr3ak2402
ed18c8d9fd Adding Qidi Tech printer images
X-Smart 3
X-Plus 3
x-Max 3
2023-04-24 12:07:55 +02:00
fr3ak2402
87d06956a4 Delete Qidi Tech X-PLUS3_cover.png 2023-04-24 12:06:23 +02:00
fr3ak2402
ae00217c37 Delete Qidi Tech X-MAX3_cover.png 2023-04-24 12:06:15 +02:00
SoftFever
162f7d2ac3 optimized hot end model 2023-04-24 18:04:47 +08:00
SoftFever
e0ac508f6a OrcaArena printers 2023-04-24 18:04:46 +08:00
SoftFever
6457608f3e custom printer profiles 2023-04-24 18:04:46 +08:00
SoftFever
5b97935562 optimized hot end model 2023-04-24 17:55:22 +08:00
fr3ak2402
f7d7fa743e Update Qidi Tech profiles 2023-04-24 11:12:52 +02:00
fr3ak2402
5da73cab0f Merge branch 'SoftFever:main' into main 2023-04-24 11:11:36 +02:00
chris
6ec8f73a76 mod vars 2023-04-24 00:56:17 -04:00
ChrisRibe
130503ce64 Added proper home index list 2023-04-24 00:56:17 -04:00
ChrisRibe
b3e20b382b Use relative links 2023-04-24 00:56:17 -04:00
ChrisRibe
05890f3120 Added default wiki content files
Added the files to doc so they are automatically pushed to the wiki via the github action.
2023-04-24 00:56:17 -04:00
ChrisRibe
27f84b8406 Fixed YAML var usages 2023-04-24 00:56:17 -04:00
chris
97706cc752 Fixed folder name 2023-04-24 00:56:17 -04:00
chris
8bc5b0029a Change branch target (for tests) 2023-04-24 00:56:16 -04:00
chris
2b31a8c4fa YAML error 2023-04-24 00:56:16 -04:00
chris
72f74d14d0 added new publish_docs_to_wiki.yml task 2023-04-24 00:56:16 -04:00
SoftFever
1347bc9290 OrcaArena printers 2023-04-24 10:24:55 +08:00
Cal Heldenbrand
22e9899309 Docker Run: Add gstreamer plugins for video support
These two packages are needed to stream video from the webcam
2023-04-24 09:42:28 +08:00
Cal Heldenbrand
978764433b Fix for MIT-SHM BadAccess X socket permissions
In some X installations using the MIT shared memory
extension for rendering window elements, Bambu
Studio needs direct access to a UNIX socket
for fast rendering.

This fix passes `--ipc host` with docker run
to allow the container to just have direct access
to the host's IPC system.

The error message that this solves is:

```
(bambu-studio:1): Gdk-ERROR **: 00:02:37.498: The program 'bambu-studio' received an X Window System error.
This probably reflects a bug in the program.
The error was 'BadAccess (attempt to access private resource denied)'.
  (Details: serial 316 error_code 10 request_code 130 (MIT-SHM) minor_code 1)
  (Note to programmers: normally, X errors are reported asynchronously;
   that is, you will receive the error a while after causing it.
   To debug your program, run it with the GDK_SYNCHRONIZE environment
   variable to change this behavior. You can then get a meaningful
   backtrace from your debugger if you break on the gdk_x_error() function.)
```

Here are some extra links for more information:

https://github.com/osrf/docker_images/issues/21
http://wiki.ros.org/docker/Tutorials/GUI
https://en.wikipedia.org/wiki/MIT-SHM
2023-04-24 09:12:34 +08:00
maosheng.wei
114baf7398 FIX: [STUDIO-2687] Translation issues with network plugins
Change-Id: I4c65f659efe44ab04fcf4a2874676761e2f713fb
2023-04-24 09:11:01 +08:00
maosheng.wei
ad035fa637 FIX: [STUDIO-2698] Load failed content translation
Jira: STUDIO-2698

Change-Id: Ic59868492eff4f91b765cb0907a94a880dba9c0f
2023-04-24 09:11:01 +08:00
lane.wei
793c50b1a6 ENH: linux: use ubuntu_latest to compile image for ubuntu
Change-Id: Idb14b776c9215752d37f16167c15b96588b91f22
2023-04-24 09:11:01 +08:00
Arthur
f793254e16 NEW: add icon of rectilinear_interlaced pattern
Change-Id: I2b91167a7efbdd239e0d46fb9643529144c04107
2023-04-24 09:11:01 +08:00
gerrit
b91155f8eb ci: update build version to 01.06.00.66
Change-Id: If03ab70b463e8a16bd76992e5608a940281a4c9b
2023-04-24 09:11:01 +08:00
SoftFever
5a49381d3c custom printer profiles 2023-04-24 02:03:40 +08:00
SoftFever
adae24a847 Merge branch 'main' into feature/merge_upstream 2023-04-23 22:54:41 +08:00
SoftFever
afe5e9ed2a simplify the v400 bed mesh, make it smaller 2023-04-23 18:48:11 +08:00
SoftFever
55c766b8ba Add bed model for FLSun V400 #825
Bed Model is a remix to make it compatible with Orca Slicer. Original model can be found  from @mcpea (https://www.printables.com/model/311792-custom-buildplate-flsun-400-prusa-slicer/files)

Adjust bed texture so the logo is less white. The original bed texture is made by @Art3Design(https://www.printables.com/model/315387-flsun-v400-prusaslicer-profile)
2023-04-23 16:47:44 +08:00
SoftFever
0c364705ed update some settings for FLSun V400 profile 2023-04-23 11:59:54 +08:00
SoftFever
d43182480c Fix some wrong top_surface_line_width values for VzBot machine.
@simonvez
2023-04-23 10:12:59 +08:00
SoftFever
338aa0a6ae Fixed an Pressure Advance calibration issue(line) for delta machines #803
(cherry picked from commit 27f92f12dc)
2023-04-23 09:15:25 +08:00
SoftFever
6ee076ab5e Disabling acceleration control persists single M204 command in gcode #795
(cherry picked from commit 40ecd8c831)
2023-04-23 09:15:16 +08:00
SoftFever
a685633e87 gridline more depth
(cherry picked from commit 3ea5a75388)
2023-04-23 09:15:07 +08:00
SoftFever
c48aca1704 tweak gridlines
(cherry picked from commit f037c3406c)
2023-04-23 09:14:36 +08:00
SoftFever
27f92f12dc Fixed an Pressure Advance calibration issue(line) for delta machines #803 2023-04-22 17:27:41 +08:00
SoftFever
40ecd8c831 Disabling acceleration control persists single M204 command in gcode #795 2023-04-22 09:48:14 +08:00
fr3ak2402
381355100c Update Qidi Tech filaments
Adding ASA
Adding ABS
2023-04-20 18:43:02 +02:00
fr3ak2402
aee2e06731 Add more Qidi Tech printers images
Qidi Tech X-CF Pro
Qidi Tech X-Plus3
Qidi Tech X-Max3
2023-04-20 17:24:39 +02:00
fr3ak2402
91dff3a963 Adding more Qidi Tech printers support
Qidi Tech X-CF Pro
Qidi Tech X-Plus3
Qidi Tech X-Max3
2023-04-20 17:23:17 +02:00
fr3ak2402
ff38540e69 Add files via upload 2023-04-20 17:20:33 +02:00
SoftFever
3ea5a75388 gridline more depth 2023-04-20 21:00:58 +08:00
fr3ak2402
3c9b466242 Add image for Qidi Tech X-Max 2023-04-19 23:39:20 +02:00
fr3ak2402
77bb548fba Support for Qidi Tech X-Max 2023-04-19 23:38:05 +02:00
Jan
5acff56ce2 The BambuStudio color gradient for Flow/Speed etc. (Fuchsia to Sea Serpent) is way less intuitive than the default PrusaSlicer one (Blue to Red).
This reverts that change.
2023-04-19 22:04:25 +02:00
SoftFever
a5d4fca039 resize SW-x2 bed texture 2023-04-20 00:38:19 +08:00
SoftFever
3216c873b5 optimize vzbot bed texture 2023-04-20 00:37:40 +08:00
SoftFever
5485e8729c optimize vzbot bed texture 2023-04-20 00:37:07 +08:00
SoftFever
4098a5267c Merge branch 'main' into feature/merge_upstream 2023-04-19 23:22:13 +08:00
SoftFever
a9356fbd20 Merge pull request #788 from simonvez/main
Adding VzBoT profiles
2023-04-19 23:14:51 +08:00
SoftFever
f037c3406c tweak gridlines 2023-04-19 19:49:21 +08:00
SoftFever
aa8c6c1ee3 resize SW-x2 bed texture 2023-04-19 19:21:37 +08:00
SoftFever
9f598046d1 Merge remote-tracking branch 'remote/master' into feature/merge_upstream
# Conflicts:
#	bbl/i18n/OrcaSlicer.pot
#	bbl/i18n/de/OrcaSlicer_de.po
#	bbl/i18n/en/OrcaSlicer_en.po
#	bbl/i18n/es/OrcaSlicer_es.po
#	bbl/i18n/fr/OrcaSlicer_fr.po
#	bbl/i18n/hu/OrcaSlicer_hu.po
#	bbl/i18n/it/OrcaSlicer_it.po
#	bbl/i18n/ja/OrcaSlicer_ja.po
#	bbl/i18n/nl/OrcaSlicer_nl.po
#	bbl/i18n/sv/OrcaSlicer_sv.po
#	bbl/i18n/zh_cn/OrcaSlicer_zh_CN.po
#	resources/config.json
#	resources/i18n/de/BambuStudio.mo
#	resources/i18n/en/BambuStudio.mo
#	resources/i18n/es/BambuStudio.mo
#	resources/i18n/fr/BambuStudio.mo
#	resources/i18n/hu/BambuStudio.mo
#	resources/i18n/it/BambuStudio.mo
#	resources/i18n/ja/OrcaSlicer.mo
#	resources/i18n/nl/BambuStudio.mo
#	resources/i18n/sv/BambuStudio.mo
#	resources/i18n/zh_cn/BambuStudio.mo
#	resources/images/ams_humidity_2.svg
#	resources/images/ams_humidity_3.svg
#	resources/images/ams_humidity_4.svg
#	resources/images/ams_humidity_tips.svg
#	resources/images/monitor_state_on.svg
#	resources/images/sdcard_state_normal.svg
#	resources/profiles/BBL.json
#	resources/profiles/BBL/filament/Bambu PETG-CF @base.json
#	resources/profiles/BBL/filament/Generic PETG-CF @base.json
#	resources/profiles/BBL/machine/Bambu Lab P1P 0.4 nozzle.json
#	resources/web/data/text.js
#	resources/web/guide/3/index.html
#	resources/web/guide/31/index.html
#	src/BambuStudio.cpp
#	src/libslic3r/AABBTreeLines.hpp
#	src/libslic3r/Brim.cpp
#	src/libslic3r/CMakeLists.txt
#	src/libslic3r/ExPolygon.hpp
#	src/libslic3r/Fill/FillBase.hpp
#	src/libslic3r/Format/bbs_3mf.cpp
#	src/libslic3r/GCodeWriter.cpp
#	src/libslic3r/Line.hpp
#	src/libslic3r/PerimeterGenerator.cpp
#	src/libslic3r/Preset.cpp
#	src/libslic3r/Print.cpp
#	src/libslic3r/Print.hpp
#	src/libslic3r/PrintConfig.cpp
#	src/libslic3r/PrintConfig.hpp
#	src/libslic3r/TreeSupport.cpp
#	src/slic3r/GUI/AmsMappingPopup.cpp
#	src/slic3r/GUI/BackgroundSlicingProcess.cpp
#	src/slic3r/GUI/ConfigManipulation.cpp
#	src/slic3r/GUI/GCodeViewer.cpp
#	src/slic3r/GUI/GCodeViewer.hpp
#	src/slic3r/GUI/GLCanvas3D.cpp
#	src/slic3r/GUI/GUI_App.cpp
#	src/slic3r/GUI/MainFrame.cpp
#	src/slic3r/GUI/PartPlate.cpp
#	src/slic3r/GUI/Plater.cpp
#	src/slic3r/GUI/Preferences.cpp
#	src/slic3r/GUI/SelectMachine.cpp
#	src/slic3r/GUI/Widgets/AMSControl.cpp
#	src/slic3r/GUI/wxMediaCtrl2.cpp
#	src/slic3r/Utils/Process.cpp
#	version.inc
2023-04-19 08:48:07 +08:00
VzBoT
da09ebcc86 Adding VzBoT profiles 2023-04-17 22:40:13 -04:00
gerrit
1f155868bc ci: update build version to 01.06.00.65
Change-Id: Ic02997afaf94adb5294e3e041df79ccab3a16a1b
2023-04-17 15:39:02 +08:00
zhimin.zeng
aaf513b356 FIX: modify the cut picture
Change-Id: I58588d03c4e265d6f7b42ae3339769e1c918b2f8
2023-04-17 15:39:02 +08:00
lane.wei
b2d82e7bbb ENH: thumbnail: regenerate thumbnail for old 3mfs in cli
Change-Id: Ia420b4c6aee072eb2a542dff574260c40de47f7d
2023-04-17 15:39:02 +08:00
gerrit
e31b12f5d7 ci: update build version to 01.06.00.64
Change-Id: I5d13d3bb5e75745159db7e406c02e3b84c433bba
2023-04-17 15:39:02 +08:00
qing.zhang
0dfbc7e719 FIX: conflict of setting-id
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I8eb290e4c1f86635b8d1cbafa80a221ab8ea967c
2023-04-17 15:39:02 +08:00
Arthur
0f61902c8e ENH: add cn translation for conflict check
Change-Id: Id2c034567dbbf8878a601af1af16f1c8d24d1033
2023-04-17 15:39:02 +08:00
manch1n
87eb0f3665 ENH: show the layer and height of conflict position
Change-Id: If80e81b5556f5afc3228a00edc2593bd8cfe63e4
(cherry picked from commit 895e0f2ecf8e259cfdb7c27081b767bfbaa3ffb6)
2023-04-17 15:39:02 +08:00
lane.wei
98f3aaa4bf ENH: CLI: add the gcode path check logic for cli
Change-Id: I424a93d9ca945598da861a1905da07ae14663157
2023-04-17 15:39:02 +08:00
Arthur
1a7b12fa38 FIX: auto-arranging result may fail clearance check
We add 0.001mm tolerance.

Change-Id: I630cc680db0a3a65a6a44e177de686fbac1e1f15
(cherry picked from commit 170f9c2a89d03060f9a9aa43952c0759ffbe7c1f)
2023-04-17 15:39:02 +08:00
gerrit
1cf688725a ci: update build version to 01.06.00.63
Change-Id: Ic7f9b55de7683565e44fcc7e5969d09b0947e14b
2023-04-17 15:39:02 +08:00
tao wang
06da649391 NEW:add chinese translation for confirmation before sending
Change-Id: I4f2c07e7dfdbdf64b419cc1e119c1d622642ddad
2023-04-17 15:39:02 +08:00
qing.zhang
63c9b81127 ENH: update the temp of high plate of PLA Silk
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I1154af98d966aa7a0f384538944d569c190ffd41
2023-04-17 15:39:02 +08:00
tao wang
d930667103 FIX:fixed sending print to LAN printer will crash
Change-Id: I067724e8ebef3425a84f6a230685c48fe48ed055
2023-04-17 15:39:02 +08:00
gerrit
3af80a8252 ci: update build version to 01.06.00.62
Change-Id: I07c035585188c7a244c7f6c703bfce4b70483785
2023-04-17 15:39:02 +08:00
tao wang
ef6827a6f8 FIX:fixed gradient filament color display on MacOS
Change-Id: I57f3243f5013b8d26ace3fae2cc41e807494af6b
2023-04-17 15:39:02 +08:00
gerrit
975aa70651 ci: update build version to 01.06.00.61
Change-Id: I6fcbbf51e3550b0f9b163d3fbe061aaa0f51fdab
2023-04-17 15:39:02 +08:00
tao wang
64e203e05c FIX:fixed some icons cant display when change dark mode
Change-Id: I0984aab97e1a1c151e9173d96c8f012935c48fcb
2023-04-17 15:39:02 +08:00
Arthur
719f273fa2 ENH: improve smoothness of tree supports
1. Instead of smoothing top-down, now we smooth tree branches bottom-up, and do not stop at merged nodes.
2. Fix a bug where some nodes don't have child. This is critical for bottom-up smoothing.

Change-Id: Iac0fecd81dac541ca390bcf5cbdfe7fd66cfd3a2
(cherry picked from commit 536a8a4f0ef76fa0358f4b4b181c4c7e7fff8bc7)
2023-04-17 15:39:02 +08:00
gerrit
763cf8ebfc ci: update build version to 01.06.00.60
Change-Id: Iea950e408c28ece068fbb93bd02f141be16026c6
2023-04-17 15:39:02 +08:00
chunmao.guo
f90974cea7 FIX: only send error log for user triggered live view
Change-Id: Ie2ff3b95d17bb060e203a51dce30c662e63320b6
2023-04-17 15:39:02 +08:00
tao wang
307ade3cd1 ENH:start checking printer connection status after clicking Send
Change-Id: Ibdd8a12b66b649b54b400433f4b3754fc1da478d
2023-04-17 15:39:02 +08:00
maosheng.wei
4d234b9785 FIX: Cancel sequence number
Jira: STUDIO-2688
Change-Id: I29d992354713dcc8caaa8fc2ab98506f1b4e0735
(cherry picked from commit f7a69618813648b0c611c9dfbff3a0ad1d7a18d6)
2023-04-17 15:39:02 +08:00
tao wang
9ca8593604 FIX:update the confirm content before sending for print
Change-Id: I9f6d8060c0c142ee966042a49a4158cb5697c5af
2023-04-17 15:39:02 +08:00
Stone Li
a8a057e514 FIX: compible with old firmware
Change-Id: I66803f95c73ffb82f539c2bfb509266ba9fdb846
2023-04-17 15:39:02 +08:00
tao wang
7e5ddccabe FIX:fixed incorrect english words
Change-Id: Ic1b581d9fbba8cd8be09a9c068a160c1bec6369a
2023-04-17 15:39:02 +08:00
qing.zhang
4c41f46163 ENH: add filament_is_support to all files
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I439ef9a2902563874d748be9aa9fe067e99588e6
2023-04-17 15:39:02 +08:00
qing.zhang
b2fbd6b09a ENH: Cool Plate -> Cool Plate/PLA Plate
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: Iaee7fb0df3a515b3fa726e16d7363e7c56ded7c2
2023-04-17 15:39:02 +08:00
manch1n
b5b7264e99 ENH: add wipe tower into conflict check
Change-Id: I9684ec17ccbfdea39deae6e5089b74ce3124d57b
(cherry picked from commit f6ee82b4ecf8bf9de91d0043b514cdabb7284b7e)
2023-04-17 15:39:02 +08:00
qing.zhang
60c444f627 FIX: crash while using MontionLine pattern
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I75232db2902a3d255336fecae7e5e628dc5ac3ba
2023-04-17 15:39:02 +08:00
Arthur
fbbfb06f6b ENH: make tree support much smoother
We increase the smooth iterations from 1 to 50.

Change-Id: Iba883fd67d7a9a71c92b364dcc9b76e00fc45820
(cherry picked from commit 945fba20a5629148bfd8cee47f492d42c50f9824)
2023-04-17 15:39:02 +08:00
Arthur
1d4a25ed20 FIX: bring back Tree Strong style
Tree Strong is too similar to Tree Slim and people don't like it.

Jira: STUDIO-2660
Github: #1579
Change-Id: I52d7e8e674f0fc332e4ab2813261ffbc4b4cfb7a
(cherry picked from commit 9eb209b4c1737d2f10b9b8bd78c9f876f3d32bce)
2023-04-17 15:39:02 +08:00
gerrit
e2e1357ff7 ci: update build version to 01.06.00.59
Change-Id: Icc76f0be665274630da56bdf756dc3d98196f99e
2023-04-17 15:39:02 +08:00
tao wang
1a99760457 FIX:fixed object cannot be selected printable on object table
Change-Id: If42027d8f51242d6f719aa371856d438fbcc7233
2023-04-17 15:39:02 +08:00
tao wang
d57931eacd FIX:fixed the invisibility of the cancel button when sending fails
Change-Id: I32e9cf0c5846565a3bc9155c57289be9df148bde
2023-04-17 15:39:02 +08:00
manch1n
40068156fe FIX: correct the translation of conflict check
Change-Id: Idbc9114926a8ad7baad38bf8e2709f2a5442b5b4
(cherry picked from commit 9688a514d37fd3ff7152378463d10683acd58cb9)
2023-04-17 15:39:02 +08:00
tao wang
c8f1b7698e ENH:optimize the display effect of white filaments
Change-Id: I690b521d641a91b7f50534ab86b5199f3dd84526
2023-04-17 15:39:02 +08:00
manch1n
f49c151611 FIX: avoid arrange to nonprefered region
Previously we assume the NFP of exclude regions are rectangle, which was
not always right. Now we calculate the NFP and find a best new position
to shift.

Change-Id: I02c075603cf71dd3c9146d7ac7a6706c0f850669
(cherry picked from commit 713ebd666c90d5dcfaf89914c37d211e9a470e99)
2023-04-17 15:39:02 +08:00
gerrit
56f1a49232 ci: update build version to 01.06.00.58
Change-Id: Ifb88521f67f1442eb9aaccd766fa5091a134b5d4
2023-04-17 15:39:02 +08:00
liz.li
9b1865667b FIX: lack of german translation
Change-Id: I45f8711d56180bd226f14552d1e1363722b2c345
2023-04-17 15:39:02 +08:00
chunmao.guo
fd787adf6b FIX: unload default user presets
Change-Id: I55e289708603f06263a64d4cfbfd1db596fdc864
2023-04-17 15:39:02 +08:00
Arthur
87abd65ea4 FIX: do not allow support thresh angle to be 90 degrees
tan(90\degrees) is too large and will make detect_overhangs very slow.

Jira: STUDIO-2620
Change-Id: I55901a6bc1b56216549f66e1a7e77c0da680997b
(cherry picked from commit e58cc8a4665808580e84107f54661447000d64f3)
2023-04-17 15:39:02 +08:00
Stone Li
bc0fe0c8bc ENH: compatible with filament unload of new firmware
Change-Id: I0b01a549929e716f0ac05176ba5dc05c360c081b
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-04-17 15:39:02 +08:00
gerrit
c51d9c994f ci: update build version to 01.06.00.57
Change-Id: I4dae551184bbb2b296723dbf5b58dee25c69610f
2023-04-17 15:39:02 +08:00
Stone Li
415fb2989d ENH: modify Support W/G display name
Change-Id: I8fbdea4411073a74df804cbcc466027b1c3e941f
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-04-17 15:39:02 +08:00
liz.li
362c365679 FIX:changed name is out of sync with printer, when send to sdcard
Change-Id: I357c0f6e53f1413af57e26e68ab44c6e76ef0ce1
2023-04-17 15:39:02 +08:00
chunmao.guo
3fff9b5c7f FIX: [STUDIO-2563] snapshot dirty load 3mf on post_init
Change-Id: I769eae7924ef3f1fefb4a9ce1a8280f477a7d49e
2023-04-17 15:39:02 +08:00
tao wang
9d4a0665c6 ENH:add chinese translation of 'layer'
Change-Id: I2a1a6524ce1e8bbc619d1cf608757699f10b0ac6
2023-04-17 15:39:02 +08:00
tao wang
185235dd93 FIX:add protection when amsmapping popup
Change-Id: Ia68e5b14c0286f84133686b45d3d8b851b7ffd82
2023-04-17 15:39:02 +08:00
tao wang
5e6cfb069a NEW:hide the entrance of filaments backup
Change-Id: I383de6ced5efb20a19ca8171f981370bf8fcc3aa
2023-04-17 15:39:02 +08:00
zhimin.zeng
2ce436d773 FIX: Cut connector tolerance does not take effect
Change-Id: I1d0cbc8995eef01e5a0134b930024b46eff9bb2e
2023-04-17 15:39:02 +08:00
lane.wei
07f4297443 ENH: privacy: refine some text
Change-Id: Id5c9c0b0700ce233e46d6ea39bbb7374f87449fa
2023-04-17 15:39:02 +08:00
chunmao.guo
a344ebcf81 NEW: Revert "[STUDIO-2476] design_staffpick"
This reverts commit 0063720bbaaa6a680f2d9f395d60cf193d126e11.

Change-Id: Ieb19daf19b38f5e25b78967ee225042988d98c7d
2023-04-17 15:39:02 +08:00
zhimin.zeng
de3bb7eb4f FIX: new project use the app_config flush_multiplier
Change-Id: I5b820399a814a043581fcfadb9629cbe15dd1c52
2023-04-17 15:39:02 +08:00
zhimin.zeng
9b6a182e8f FIX: modify the translation.
Change-Id: I94c1dc1a811b063611d43f6bde5e591e381cb4da
2023-04-17 15:39:02 +08:00
liz.li
cb68d4c60b FIX: tooltip display problem
Change-Id: I122f9b63a7e458838552c9d9cd0ee20d7bd7bfd5
2023-04-17 15:39:02 +08:00
Stone Li
4174f361f1 FIX: fix crash when no sec_link
Change-Id: I41aa905b0dcac3d5b162fea5b19a1d2c6aa72b68
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-04-17 15:39:02 +08:00
liz.li
aa6785bde4 FIX: magyar display problem
Change-Id: I7b202b7f240fb7426529b8e8165621d4ac9664b7
2023-04-17 15:39:02 +08:00
chunmao.guo
874081e8d7 FIX: open more staffpick
Change-Id: I955cf2aa774ddedcc42ac68e367232c106b18988
2023-04-17 15:39:02 +08:00
chunmao.guo
a2386a3c3b FIX: [STUDIO-2617] thread locale when save 3mf model
Change-Id: I0b76b70922df8ec4fdeec7e15d824b9acd19a63b
2023-04-17 15:39:02 +08:00
salt.wei
60dd35b4bf ENH: fuzzy skin handling
1 limit the range of setting
2 avoid too dense points when fuzzy skin enabled

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I6691fd03d2aa960b055b68100dfb338b640cb4af
2023-04-17 15:39:02 +08:00
chunmao.guo
0ea0d7e456 FIX: not report liveview failure on stop
Change-Id: I1cce2bde58e3c8ca7a0dbda905552cd37789d203
2023-04-17 15:39:02 +08:00
Stone Li
b734079697 NEW: add Client-Name to http header
Change-Id: Ib2d4a2fd6262e833a8237d065d705ce6bad4e735
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-04-17 15:39:02 +08:00
gerrit
474e363651 ci: update build version to 01.06.00.56
Change-Id: I905ebcc5f734aa95a94e2fe4d2649582a11544c9
2023-04-17 15:39:02 +08:00
liz.li
2954a947af FIX: delete plate shouldn't have a shortcut key
Change-Id: Icbe920c4ae30c2054cc7e114e00e829b862b04b0
2023-04-17 15:39:02 +08:00
liz.li
92266c1edf ENH: add a tooltip of adding custom gcode
Change-Id: I8908dd7cdba6138a90fb9a7de92d9eb346495690
2023-04-17 15:39:02 +08:00
liz.li
adb6583458 FIX:(mac) cannot use copy and paste in imgui input box
Change-Id: I4024bfbe178f86a5d456de47ddd82bc028d4788c
2023-04-17 15:39:02 +08:00
tao wang
639f2a57ae ENH:update the layout of the filament backup
Change-Id: Ie1d4b29524484a892e8305b891c8a8ba3f397054
2023-04-17 15:39:02 +08:00
tao wang
9fc29ac138 FIX:fixed invalid load when there is no filament in the extruder
Change-Id: If10026787367a596a1bad97a8ec06a645bed93f2
2023-04-17 15:39:02 +08:00
manch1n
29459fe4cb FIX: avoid wipe tower conflict with objects
Change-Id: I09f6937a4bb698e4981c094c5694b3ce50efd2b4
(cherry picked from commit 2fc3f05732b8e5c7132b6c8a5f4403d30c516bff)
2023-04-17 15:39:02 +08:00
manch1n
229b173894 FIX: arrangement crash due to mutithread call to transformedShape
STUDIO-2653

Change-Id: I82031d3adbd95f8af04cb5f15b39d0621a40c7f3
(cherry picked from commit 065575c4845688ecb6293fa826e5f987f019d9fb)
2023-04-17 15:39:02 +08:00
zhimin.zeng
6e797e7a99 FIX: flush volume is error when flush_multiplier is 0.
STUDIO-2636

Change-Id: I013a6c974799996744727b3f50426bf806c5b2df
2023-04-17 15:39:02 +08:00
qing.zhang
d3d3f41f8c ENH: update fan nax speed of Bambu PETG Basic
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I7e43702eb3af0e7960ea91ef3dd3a38c496b6f6b
2023-04-17 15:39:02 +08:00
lane.wei
5772b013de FIX: fix the filename not correct issue under linux
Change-Id: Ic720c7734be60197135965f3dcecc84eb9a8eb5d
2023-04-17 15:39:02 +08:00
liz.li
7efa355ff5 FIX: remove layer menu
1.remove layer menu
2.add dark color adaption of obj_layer

Change-Id: I8faf5f69359f0d0fff769887b800f3963884d55d
2023-04-17 15:39:02 +08:00
Stone Li
8ace4e6d81 ENH: sync with localazy
Change-Id: I03891176cee9a41ed5524d32d0e0a01f657d62d1
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-04-17 15:39:02 +08:00
Stone Li
5114a79e2c FIX: clean ams result when unchecking enable ams
Change-Id: I95a416f966d1aa81301dd8685f0909eeff8ad2c1
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-04-17 15:39:02 +08:00
tao wang
a798ed22b9 ENH:optimize virtual tray when printer is no AMS
Change-Id: I68425afc8c3f467a8e3f3c2745b6ac9cfb80232e
2023-04-17 15:39:02 +08:00
qing.zhang
afb9886e0e ENH: add Bambu PLA Silk & Bambu PETG Basic
add cool plate temp for PLA

Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: If3ca9c773351939358d7bed9f6d6c890a28b302b
2023-04-17 15:39:02 +08:00
liz.li
62af2b9608 FIX: vector capacity reset(STUDIO-2239)
Change-Id: Ie40e8c6d3a42b6a40f4f73d6906acdc6e26d0b41
2023-04-17 15:39:02 +08:00
tao wang
9c402384ac FIX:fixed move wrong pos when amsmapping window popup first time
Change-Id: I5a9830141ef897399097dc21e70bfddd5113bcff
2023-04-17 15:39:02 +08:00
chunmao.guo
5468573e27 FIX: [STUDIO-2438] inline search line in popup on Linux
Change-Id: Idcf7c4eca52438aab4129163b90314631b7f7492
2023-04-17 15:39:02 +08:00
chunmao.guo
2003bbd768 FIX: Flush log in generic_exception_handle
Change-Id: I07fd22ace35418f18694fec017a0a7633065ef10
2023-04-17 15:39:02 +08:00
tao wang
6887626313 ENH:privacy agreement does not jump to local web pages
Change-Id: I00be32922e1c6e2e0bbf69a6382e405dd8c2bf98
2023-04-17 15:39:02 +08:00
tao wang
466e17ea88 FIX:fixed color picker display error in dark mode
Change-Id: Id31d19d33f7ced0a89b5bc61b0d913554dc38be2
2023-04-17 15:39:02 +08:00
gerrit
7ba23d7ec7 ci: update build version to 01.06.00.55
Change-Id: I8b1ba77a337e78f7e617dcd44edb16aef1a8fa9e
2023-04-17 15:39:02 +08:00
manch1n
dd473bdc3f FIX: avoid wipe tower conflict with objects
Use a more accurate way to estimate wipe tower:
1. read wipe configure from front-end (the positions may be different at
different plates).
2. when depth is unavailable, use all materials to estimate depth (the
estimated wipe tower may be larger than the actual generated one).

Change-Id: I42ffd03d9817b57f5023a6820cda0032509c6fe5
(cherry picked from commit 77ba9757023afb9160c996eeea6ead8a27b50ce4)
2023-04-17 15:39:02 +08:00
lane.wei
67d95d3fc8 ENH: add protect logic in post_init to check opengl resource
when the opengl context not ready
postpone the GLCanvas3D's init

Change-Id: I68b9d70f08e4ba0076a64aca59612a3f613070ff
(cherry picked from commit 446a384dcc74af8184ee0a1af6668626d13413e9)
2023-04-17 15:39:02 +08:00
lane.wei
1cb64c15a0 ENH: translation: update some translate of Chinese
Change-Id: I998eaf77853debdceb95172eb3d0ff3d44916c44
2023-04-17 15:39:02 +08:00
liz.li
bde527f6e1 FIX: mac command key display
Change-Id: Ida9f41e7c05a414122176893dafaf150c460d458
2023-04-17 15:39:02 +08:00
manch1n
62a2fadeb8 ENH: make arrangement align better
Jira: STUDIO-2584, STUDIO-2507

Change-Id: I1987103e46f5ecb84395b5885954679ffe105c60
(cherry picked from commit 90df278408b79ad5b8d4ceaf90fe483cd8f5a48c)
2023-04-17 15:39:02 +08:00
tao wang
1e731a15f0 FIX:delete default search terms for search controls
Change-Id: Ic400f4120fc78f78ffb138848c9e8046bc32954a
2023-04-17 15:39:02 +08:00
tao wang
b116a605f2 ENH:update information for send print timeout
Change-Id: I36ecfef98b285ff870e7a1ea382adc4e901eb52e
2023-04-17 15:39:02 +08:00
tao wang
13f5171eb3 FIX:fixed no longer prompt no SD card when disabling AMS
Change-Id: I4083ffc46dee3526d61735206c4795f96d9f2f96
2023-04-17 15:39:02 +08:00
wintergua
6f5de187c6 ENH: enable inner brim mode
Change-Id: I22f53c75e0731cb1ad397c1233e858a5b9a8fc0f
(cherry picked from commit 66637a616498c8fc38745670a75ba119ae9b1a5f)
2023-04-17 15:39:02 +08:00
gerrit
951be6e471 ci: update build version to 01.06.00.54
Change-Id: I9a6afcb3ee5f2545565367e6873846bee52d1bd2
2023-04-17 15:39:02 +08:00
liz.li
db3acf7d72 FIX: cannot click AmsMapping
Change-Id: Ie6e908ee263d2c072520cdc8d8228f740646c995
2023-04-17 15:39:02 +08:00
lane.wei
420fae9bbf FIX: fix a crash issue when switch language under debug mode
Change-Id: I901e880601f963ceea433aaec1c455c2698b77f7
(cherry picked from commit 6a0fc275664503a53515d174ef7c71c829db4b14)
2023-04-17 15:39:02 +08:00
lane.wei
697a45379f ENH: refine the multiple-object detects logic while sinking opened
no need to detect the project file

Change-Id: Ia84d94832d16c2a68ecc25ee457d79735873e82a
(cherry picked from commit 39e9f3de907f19d452abf831221656c9a8e1d0e0)
2023-04-17 15:39:02 +08:00
lane.wei
90760e0d07 ENH: refine the thumbnail rendering
1. add specific shader for thumbnail
2. do not render the negative-z part
3. fix the sinking related issue under cli

Change-Id: Ia59083437544c1c0bd924c811274ccbb137e9eb7
2023-04-17 15:39:02 +08:00
gerrit
031d61faca ci: update build version to 01.06.00.53
Change-Id: I5c1a8aef816ebde7b1703b414aa9bffe3922a1a8
2023-04-17 15:39:02 +08:00
chunmao.guo
0aea102bd3 FIX: [STUDIO-2631] call AddScriptMessageHandler queued
Change-Id: I6a71c2db3ed1b3d06931f53428a8d78881399b4d
2023-04-17 15:39:02 +08:00
chunmao.guo
e11c004de4 FIX: [BLPIOT-64] only default or user presets
Change-Id: I1c846aa26fdac95652ae8e7b3d01c30f99e7ef61
2023-04-17 15:39:02 +08:00
tao wang
eb86b00c82 FIX:fixed speed control window will not dismiss
Change-Id: I7d053936fd13b08f624f7e1488fcc79d9a270f53
2023-04-17 15:39:02 +08:00
tao wang
e2b8bff660 ENH:clear virtual tray when change printers
Change-Id: I894c9ba54512a1b833bfd9da33f901457d297aed
2023-04-17 15:39:02 +08:00
chunmao.guo
c0bcb2270a FIX: [STUDIO-2557] use load() to stop media play on windows
Change-Id: I0d2d45569ef64a5a212ea04fe926a3a25ce7b50d
2023-04-17 15:39:02 +08:00
tao wang
82b3e92069 FIX:fixed crash caused by ColorPicker not being initialized
Change-Id: Id394a68b00b28c02a682ed457a14235a2e9f7053
2023-04-17 15:39:02 +08:00
tao wang
50d9dd331c ENH:update some Chinese translations
Change-Id: I280a9340c0540b5c00d8651f3c9705b775a359c7
2023-04-17 15:39:02 +08:00
liz.li
b42a0d5632 FIX:custom gcodes are reset after import geometry only (STUDIO-2595)
Change-Id: I11052ea28aacca78103852d2beba0dc97b42eb31
2023-04-17 15:39:02 +08:00
wintergua
0440e288f7 ENH: move the volumes grouping process to an indivial function
grouping of volumes in the slicing process, which will be used by the brim generation processes,
is moved to an indivial function from the fixed_slicing_errors function.

Change-Id: I241081823a671829d8cc4e923da5f6f22776c410
(cherry picked from commit 18a7b541ee48f3c01319d5835c05610c3d8ca0ae)
2023-04-17 15:39:02 +08:00
liz.li
bd29e371a6 FIX: shortcu key tooltip on aseembly view
Change-Id: Ibf02cd7caf68bb7624021e469aab00bcc2ccb77e
2023-04-17 15:39:02 +08:00
liz.li
688640e808 FIX: display '?' on a notification(STUDIO-2199)
Change-Id: Id20f287aa1e26571cb416c5f237257418589cf29
2023-04-17 15:39:02 +08:00
liz.li
a6be285843 FIX:textinput behavior on send dialog (STUDIO-2347)
Change-Id: Iec970de7cd2f85b835b64283089c41f52df1cfcc
2023-04-17 15:39:02 +08:00
tao wang
f0a41b552b FIX:fixed loading model failure on macos
Change-Id: I3b7944e4dc7339404efc76323d898b660810a92b
2023-04-17 15:39:02 +08:00
liz.li
6d445f5754 FIX: time displayed inconsisitently(STUDIO-2001)
time displayed in send_dialog should be consistent with time displayed
in preview legend.
Change-Id: I4aa3bd0e8e7a2688cb7b97ea39fd9c0e1a361f52

Change-Id: I3763f5232ab61a5609248f1f7d79373f4077fec7
2023-04-17 15:39:02 +08:00
tao wang
e25dd0ca01 FIX:fixed the length of the progress bar is incorrect
Change-Id: I56f0bd70a5bdd523d5b4c08038ebffc7468ea2c0
2023-04-17 15:39:02 +08:00
tao wang
94d50a1177 ENH:use layer to represent the current number of layers
Change-Id: I42d1f55a16efd6082df82e12c7bff575eea74fad
2023-04-17 15:39:02 +08:00
liz.li
acae9fc088 FIX: preview tick should reset in some case(STUDIO-2621)
Switch to ByObject or switch spiral vase mode, should clear all preview
tick because they are invalid and doesn't work.

Change-Id: If68e9ebe4e915286a34e2e1003b281d770f0864c
2023-04-17 15:39:02 +08:00
gerrit
f704dbf8d8 ci: update build version to 01.06.00.52
Change-Id: I8c8198714f2252848e1b3ad76f6d4f3275c38088
2023-04-17 15:39:02 +08:00
Stone Li
b99b1f8d73 FIX: fix a bug that can not send all to lan mode printers
Signed-off-by: Stone Li <stone.li@bambulab.com>
Change-Id: I704cf0336dc809c84a1d8e149e831ffcf55f3004
2023-04-17 15:39:02 +08:00
Stone Li
f2c06d7059 ENH: add some protective code
JRIA: STUDIO-2487

Change-Id: I9b6e3e6af70877b685d2bfec1592975ef16134fd
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-04-17 15:39:02 +08:00
gerrit
e2395744b1 ci: update network module based on commit 6a243cc
Change-Id: Iab3750f3a7575093a72781fed861a1f3f41f1d1f
(cherry picked from commit ddc88c624b11eb0f66064a54e7c9cc50546ef6eb)
2023-04-17 15:39:02 +08:00
Stone Li
ca4902fb87 ENH: update version to 01.06.00.51
Change-Id: Iaddd6c5a0795e95c165b5945470f122d8ebffe0b
2023-04-17 15:39:02 +08:00
chunmao.guo
bdc500d90f FIX: [STUDIO-2625] fix backup_switch from < 01.06.00.00
Change-Id: Iedc2e26bfc346fd7e92b4c2862f2cef1ca9aa96f
2023-04-17 15:39:02 +08:00
chunmao.guo
3e18543389 FIX: [STUDIO-2523] sync user preset on restart network
Change-Id: I9099b469a16e6714f65c1d806f9e7ce1dcc2fe72
2023-04-17 15:39:02 +08:00
tao wang
f06b214c30 ENH:optimize ams settings and virtual tray
1. separate virtual tray and extrustion calibrations
2. only when confirming will the disabled materials be checked
3. uptimize ams style

Change-Id: Ie435555d0cad45fbc0cb1bf7e1706985ec1aaa78
2023-04-17 15:39:02 +08:00
Stone Li
4c6623848d ENH: refine tips when sending print job
Change-Id: I2ff35053cf507329880caae3dbfe700d6e45ca2e
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-04-17 15:39:02 +08:00
Stone Li
464af822e1 ENH: add print error in cmd clean_print_error
Change-Id: I22328a8be58c9896c40eb5f270e8a08e4469bd7d
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-04-17 15:39:02 +08:00
Stone Li
92255cbede NEW: update po files
Change-Id: I73c63d9155c8c612d629623a633b8bfcfcee0a1a
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-04-17 15:39:02 +08:00
liz.li
a64f587cc2 ENH: add some cn translation
Change-Id: I325f06264780acf8ab69f1f32fef22b6e175a0b9
2023-04-17 15:39:02 +08:00
lane.wei
4e5ed34fde ENH: CLI: set the default pipe to null to remove warning
Change-Id: I9e2cbb3bba02892a6a97a6a3e0bd9b0f729d202a
(cherry picked from commit 1b94c924919c60231e9a87717d0b51204e37dcbc)
2023-04-17 15:39:02 +08:00
zhimin.zeng
4d958df4b3 FIX: Concave painting of thin objects does not work.STUDIO-2334
Change-Id: I4812e7940f4f2764a51881d10bc513e7e6c028b6
2023-04-17 15:39:02 +08:00
Arthur
3d710609d9 ENH: improve cantilever detection's speed and accuracy
Cantilever detection should be done layer by layer, instead of using
merged_poly of clusters.

Jira: STUDIO-2198

Change-Id: Ifea017fc4c13425a944ee80f7dedb603a8e14cc2
(cherry picked from commit 0803a439a458ffeb9c6d91e90344a5b78794a6bd)
2023-04-17 15:39:02 +08:00
zhimin.zeng
74e1ba7963 FIX: failed to import svg file(path + width) STUDIO-1807
Change-Id: I2a4e1866c0f23bfbec4ae6765a78f6f7d994cd19
(cherry picked from commit c8b59f4e3ffd0ba34a5d56ca7a0538ee854f1a91)
2023-04-17 15:39:02 +08:00
zhimin.zeng
37ed71b764 ENH: Save text information to 3mf file
Change-Id: I28b984b5ad3f7a8e3332eb4b7fe9e8f942e81418
(cherry picked from commit e56d21a376d96605b071af906b653101f63ec9e2)
2023-04-17 15:39:02 +08:00
gerrit
a6bf1c946a ci: update build version to 01.05.05.68
Change-Id: Iff517c101fb4c500f463a93aa74fccf8818eaa1e
2023-04-17 15:39:02 +08:00
zorro.zhang
cc6bd668ae NEW: Staff Pick UI WebPage
Change-Id: I85c5b5ba28144a75dc231b99d73a8f5c2ce941f4
2023-04-17 15:39:02 +08:00
gerrit
ceea4bb7cb ci: update build version to 01.05.05.67
Change-Id: I69e4c5d72debabc3e24a41f70fc5b02124adb1a0
2023-04-17 15:39:02 +08:00
wintergua
b15e9a89cf FIX: grouping single layer volumes during briming
If an object has only one empty layer, error will encount
during grouping volumes
studio-2602

Change-Id: I25871b8cc8e4772c347c615db346875a9658db71
(cherry picked from commit 78b7e7706f6c8e7e86f4bd2e8daab7036499ced2)
2023-04-17 15:39:02 +08:00
zorro.zhang
d4907f0e4f ENH: Optimize Dialog Positon Again 2
Change-Id: I3f2af3ee696415d07fc926596e110d5874dc579c
(cherry picked from commit 73baa282ab7a98df9cde95703da096c6a02eac61)
2023-04-17 15:39:02 +08:00
liz.li
b2e4935b6f FIX: german translation
Ctrl -> Strg
Del -> Entf
Shift -> Umschalt

Change-Id: Ifa340ee86cb9fb96ec3694ef47cac5235f519c40
2023-04-17 15:39:02 +08:00
gerrit
49f6e3f3c6 ci: update build version to 01.05.05.66
Change-Id: I6f38bddfef8ed5ae13ad355326690c312e0e364e
2023-04-17 15:39:02 +08:00
lane.wei
b30644c84d ENH: CLI: add the cache logic of brim data
1. cache the first layer group cache data for brim
2. fix some crash under debug mode when app exits

Change-Id: I81d716564af414353e9dfeed42e5f4eef08b2d6f
(cherry picked from commit a6ecdaed6f63f1c5c41fd343f72165fe27fda9d3)
2023-04-17 15:39:02 +08:00
Stone Li
f3aa76e4c2 NEW: set bed type when printing
Change-Id: I94b32e6264ecae4a8a6ca20eed0d08d13c6e391d
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-04-17 15:39:02 +08:00
yifan.wu
34ec55db80 ENH: optimize thumbnail effect
1. enlarge objects in thumbnail
2. restore the background color to the light color

Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: I0829f93f619c48467c91d55267cdaf5bf43c5beb
2023-04-17 15:39:02 +08:00
liz.li
69dcbef290 FIX: cannot save project after adding custom gcode tick (STUDIO-2451)
Change-Id: I8e787d7bd8eebd793a6e070a18f36afda57b0ecf
2023-04-17 15:39:02 +08:00
Arthur
74d558e612 FIX: tree support crashes when lower_layer is null
Change-Id: I942bdf1dfc253be5ebf659274f230290c5260d63
(cherry picked from commit 05b033cd0dfacadab9ea3e725e364a6156d068f2)
2023-04-17 15:39:02 +08:00
gerrit
fa1be64652 ci: update build version to 01.05.05.65
Change-Id: Ia1998a60f0f8970ff6797a2c18136785f2a6b037
2023-04-17 15:39:02 +08:00
liz.li
02fbd88150 ENH: rename tracked crash log
Change-Id: I60d1c1af873c60776334f26503e22230bb541e0a
2023-04-17 15:39:02 +08:00
tao wang
fddd101685 FIX:fixed the publish button will be hidden after switch languages
Change-Id: I2f618d8440ebf7a00af6e7ad2bcda63746e04eef
2023-04-17 15:39:02 +08:00
tao wang
8dabc0ce97 ENH:add protection when Unable to get filtration supplier information
Change-Id: I64481ace6948cfab67bd864c2925cdce7dcae034
2023-04-17 15:39:02 +08:00
tao wang
14c63c9e9e NEW:studio support for Italian
Change-Id: I79aeffee01decd915c5f0719e0fc58a24ce01780
2023-04-17 15:39:02 +08:00
zorro.zhang
31667d04b0 ENH: Optimize Dialog Position
Change-Id: I6795d6d0f979ff379b8c4f1f010eeaba6aa339b1
(cherry picked from commit 2ce1e9a9f3141bc2149a4d1f62656f1a3d57b26e)
2023-04-17 15:39:02 +08:00
gerrit
5ec2e91b9d ci: update build version to 01.05.05.64
Change-Id: Ib8a7c5ac4e6c71568534c75292a287f31e48dec2
2023-04-17 15:39:02 +08:00
chunmao.guo
32b6952950 FIX: [STUDIO-2596] import preset missing base_id
Change-Id: I2725906da26a471aef66eb8f29bf156ad00b1ec0
2023-04-17 15:39:02 +08:00
gerrit
483fc9f147 ci: update network module based on commit be95fa8
Change-Id: I3ba0ac192eb9ee9e6fe1e1deff2d18c770ae63a3
(cherry picked from commit a38f0804ab1fa1131e7955f4c13c27972d36b93e)
2023-04-17 15:39:02 +08:00
tao wang
1eb96b6979 ENH:synchronize the status of AMS and printers
Change-Id: Ied38fbee8d78a984df9d7a46d3f69b54fea7fef2
2023-04-17 15:39:02 +08:00
tao wang
cb2f6dd772 NEW:add network test entry when has network error
Change-Id: Ie315191e26148e520d3e8e3e4323fd619efb982a
2023-04-17 15:39:02 +08:00
tao wang
00e1c50947 NEW:AMS supports ams filament backup
Change-Id: I0bc84f52bcd88dbbc1b9614b15474433c748cc14
2023-04-17 15:39:02 +08:00
Stone Li
f596a822e2 ENH: update version to 01.05.05.63
Change-Id: I79847e97e6f0a85b28e3ca85297249a9c46ef913
2023-04-17 15:39:02 +08:00
liz.li
87df72a67f ENH: modify zoom interaction
Change-Id: I7a888a8980b5b10e5d2c515158c9c4cdf8654b7c
2023-04-17 15:39:02 +08:00
zhimin.zeng
62df53f86e FIX: A mesh with overlapping faces cannot be painted
STUDIO-2591

Change-Id: Iad566cdc45d123b5c8342c732c0dc964c261753a
(cherry picked from commit eb9f7297e0ea0557b32e5f59c3a91692ac8afa5b)
2023-04-17 15:39:02 +08:00
liz.li
97bdeb7771 ENH:support clear ams setting
Change-Id: Id91bd8f69de640650770067d6159748ee7e416c9
2023-04-17 15:39:02 +08:00
tao wang
e0bd625041 FIX:update the url address of the model mall
Change-Id: I2021c141402f8eca999a66607e92b691e847b7be
2023-04-17 15:39:02 +08:00
tao wang
ce9ac8b3d6 ENH:display the correct author name on the project page
Change-Id: I3ce5718b82cc6ae3ed4bf4e3e19673f790cd5788
2023-04-17 15:39:02 +08:00
liz.li
3c6e68553b ENH: add height_range
Change-Id: Ica4def5d54f9e0906d424eea1efd3545b79ed186
2023-04-17 15:39:02 +08:00
chunmao.guo
8747192715 FIX: [STUDIO-2235] FlushFileBuffers on conf bak
Change-Id: I26ddf05c8b7105bb9226930e64a736cdc9be4e4f
2023-04-17 15:39:02 +08:00
qing.zhang
97179d1378 ENH: arachne + overhang slow down
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: Ic015c1c6d369edabaa1195416942881c0756f839
2023-04-17 15:39:02 +08:00
zhimin.zeng
ad80943c69 FIX: delete unnecessary travel of wipe tower
STUDIO-2203

Change-Id: Ic55030a09f66a789245f80096e8f3ffea73a904f
2023-04-17 15:39:02 +08:00
lane.wei
cf6077fe7d FIX: CLI: fix the no-check not work issue
1. no-check not work
2. refine the progress updating logic

Change-Id: I8acf18d8ab8958310fa3375de50cc9692b3408c1
2023-04-17 15:39:02 +08:00
Arthur
15ba872d1c ENH: only draw infill in normal nodes of hybrid support
1. Only draw infill in normal nodes of hybrid support.
  Previously when hybrid support was selected, all nodes would have
  infill including the circle nodes which don't need infill. Now we draw
  infill only when there are normal nodes.
2. Move remove_bridge after small overhang removal because the trimmed
  bridge may be detected as small overhangs.
3. Only split circle nodes in draw_circles to prevent floating circles.
4. Fix the issue where tree support infills may not be aligned,
   which is caused by the changing spacing of filler.
5. Fix a bug where lightning infill in tree support may crash.
   Note: it is still not prepared to set lightning infill as default,
   as for some models the generation time of lightning infill is still
   too long.

Change-Id: I556e5097041d09afae1e2957d4dc9914d4610149
(cherry picked from commit 4c0849a81b60cde0c3b8ca54f03f63ea7c62dcd9)
2023-04-17 15:39:02 +08:00
zhimin.zeng
e6e0085dcc FIX: the volume position is not correct(3mf from solidwork)
Change-Id: I69fe3f9896214da502b60bc23deee6525599677e
2023-04-17 15:39:02 +08:00
zhimin.zeng
abf12366e7 FIX: Problems due to precision errors. STUDIO-2051
Change-Id: I8005f2879b33408df44c476e4297928ca0c52ed9
(cherry picked from commit e789ddd050ee69404a9f6a88686eeed0880da00f)
2023-04-17 15:39:02 +08:00
Stone Li
82ee622ce3 ENH: avoid to crash log when parsing sequence_id
Change-Id: I14ff7167cf4291a09d955d1ac295197470734546
2023-04-17 15:39:02 +08:00
Stone Li
9606a04117 NEW: support clean print error
Change-Id: I0d0b6b5dae22bf5ee793d748d3afb5d45fbf744a
2023-04-17 15:39:02 +08:00
Stone Li
8675815fb3 ENH: do not use_open_ssl for engineer machine
Change-Id: Ie4b8384324c25f9f402aa78b19e1140492dbef19
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-04-17 15:39:02 +08:00
tao wang
6175446aaf NEW:support for importing models from browser to Studio on mac
Change-Id: Ia4c39b3de1705d66a00442d11bd15a61ebc349ff
2023-04-17 15:39:02 +08:00
Arthur
cf556814ce ENH: translate missing entries
Jira: STUDIO-2577, STUDIO-2581,STUDIO-2582,STUDIO-2585

Change-Id: I560635756f7d0a9b27e4827920fe84c724d09f01
2023-04-17 15:39:02 +08:00
Stone Li
4a99304c4f ENH: update version to 01.05.04.xx
Change-Id: Ia53270bab7171376883cb01d158f0e0d6bdfc875
2023-04-17 15:39:02 +08:00
lane.wei
7595775ba5 ENH: update: remove the old cached ota files in some corner case
Change-Id: I8039e21045d33827dae096b18feead6150981056
(cherry picked from commit d920b3a57c284422e09c952b103c5f26ae551d2a)
2023-04-17 15:39:02 +08:00
lane.wei
59a7cd3ef9 ENH: thumbnail: improve the effect of thumbnail
1. adjust the background color
2. add a bit more emission factor
3. adjust the thumbnail rendering size in preview
4. change the font to white of thumbnail preview

Change-Id: Ifbcac94383608054759a7a31ec357233c7fb57a9
(cherry picked from commit ac577934f11edd56069584d1450734df59e17989)
2023-04-17 15:39:02 +08:00
chunmao.guo
4b5fa4fe58 FIX: param full field with for multiline option
Change-Id: I8dd53e461645810e6db3e17b75e3e7c4a0c1e01d
2023-04-17 15:39:02 +08:00
chunmao.guo
04d24fbb2f FIX: [STUDIO-2575] crash report invalid uft8 char
Change-Id: I7fd5290774d3d54efdee65bfe1191a932e252f87
2023-04-17 15:39:02 +08:00
tao wang
ee2ef44dc7 NEW:ams control support for more gradient colors
Change-Id: I3e7e7e1f340a443200b9225b142f6398b4824513
2023-04-17 15:39:02 +08:00
tao wang
e3d89f2154 FIX:fixed ams cannot displayed when amsid does not start from 0
Change-Id: I2beee54bc99ced5faf9ea58e6ff3f5aaa3504a64
2023-04-17 15:39:02 +08:00
tao wang
27f4c282f2 ENH:add new prohibited materials
Change-Id: I621aaf9ceabe11dbedd4e77376f10650be453abf
2023-04-17 15:39:02 +08:00
Arthur
6facd65530 FIX: sharp tail detection in normal support was wrong
1. Fix sharp tail detection in normal support.
The not operator in front of overlaps was missing.
2. Fix bridge removal.
After adopting Prusa's smart bridge direction detection, the bridge
angle may be pi, so our previous method (comparing angle to 0 and pi/2)
was not right. Now we simply check if the bridge direction normal vector
is aligned to x-axis or y-axis.

Change-Id: I4e1fd937e432aca97cdd374ba66a0d869794126e
(cherry picked from commit c0d82003a5e4c44345219294072c54051fc5711a)
2023-04-17 15:39:02 +08:00
chunmao.guo
0ca3f27c54 ENH: [STUDIO-2550] config auto sync system presets
Change-Id: I83f9baae5793b214f4d1c040f5819ad9a03cd47f
(cherry picked from commit 40fe90e176fc001f54b22375ddb0dd035a6d84cd)
2023-04-17 15:39:02 +08:00
liz.li
d776c7595e ENH: enable gcode window and support viewing added custom gcode
Change-Id: I2def8c32c17b6f2edfd2e6d0776123127560f167
2023-04-17 15:39:02 +08:00
lane.wei
e2f96590cf ENH: CLI: add normative_check logic
Change-Id: I7a02fefb2a161b27a35ad73102d8c57dbffa7c6b
(cherry picked from commit 3de468b341e95336611ff527453160131ec04b65)
2023-04-17 15:39:02 +08:00
salt.wei
e2d6ed99d1 ENH: add post_process back
Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I05fc655080f3888255297d689552de84a81ed849
2023-04-17 15:39:02 +08:00
chunmao.guo
8c39fbaf22 ENH: [STUDIO-2549] remember my choice on unsaved project/presets
Change-Id: Ib9fc9074075bfce19f9a02be3aff7b3d04e3802a
2023-04-17 15:39:02 +08:00
chunmao.guo
778761908a ENH: [STUDIO-2548] maximum recent project count
Change-Id: Iba9c9959089ff1cb9dfdba717fe62b99375da137
2023-04-17 15:39:02 +08:00
Arthur
0c2ba2b0a2 ENH: improve sharp detection for small regions
1. improve sharp detection for small regions.
   When the region is around 1 extrsion width, previous method may miss some sharp tails.
Now we reduce the width threshold to 0.1*extrusion_width for sharp
tails.
   When checking "nothing below", need to expand the poly a little. Example:
benchy.
2. improve is_support_necessary.
   Only popup warning for sharp tail and large cantilever (longer than 6mm).

Jira: STUDIO-2567
Change-Id: I5e977e7766b35409891d1b41e36278e3f07fa372
(cherry picked from commit c9d8a7c1c3bbd4367c7fc44408c67e5c534167f4)
2023-04-17 15:39:02 +08:00
salt.wei
6ddcc14577 ENH: support fuzzy all wall lines
Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: If6754b6a958203459882a125048e01b347e0a4db
2023-04-17 15:39:02 +08:00
chunmao.guo
6ee93d5646 FIX: [STUDIO-2447] ImageGroid: clear scroll offset on list changed
Change-Id: I8c2b2bfed096e99e2223ff109e5d70ea2bc3a82a
2023-04-17 15:39:02 +08:00
chunmao.guo
84580f6f94 NEW: [STUDIO-2476] design_staffpick
Change-Id: Ibe4d540ca31882e199437dc2811925e1a40680ec
2023-04-17 15:39:02 +08:00
tao wang
20ad3c7f9a ENH:add some Chinese translations
Change-Id: I610c23cbe36fb8f66c8a69e53330ec941174f12e
2023-04-17 15:39:02 +08:00
manch1n
d72b4c1bfe FIX: Disable print button when gcode has conflict
Also fix a crash bug due to setStarted and setDone.

Change-Id: Ib9b069fe4b7e5d1fc359f48e44b4032dd8249428
(cherry picked from commit 9ef190ed3ecd66d12617ad96e927ff34251395a2)
2023-04-17 15:39:02 +08:00
zhimin.zeng
e002885efc FIX: modify the style and layout for cut
Change-Id: Id9f84fc58385ae408a4c28c0d4eb63e48335039e
2023-04-17 15:39:02 +08:00
liz.li
9b47255bc1 ENH:adjust assembly view toolbar UI (STUDIO-1213)
https://jira.bambooolab.com/browse/STUDIO-1213

Change-Id: I3b17b37a229348d347f56d0672f2c258fbeb91e1
2023-04-17 15:39:02 +08:00
tao wang
ffc4e7080c FIX:fixed translation does not take effect
Change-Id: I83e2f2d53cdb4ded7cfa4176146b29920d21dcc8
2023-04-17 15:39:02 +08:00
liz.li
907741e7e4 FIX: AboutDialog layout
Change-Id: I693f489ba92f3d4ac60abb4344063b88fb201c29
2023-04-17 15:39:02 +08:00
zhimin.zeng
b746877d70 FIX: modify the shader load error for mac
Change-Id: I3e2b282b145b4d87e09c22d4fec1b88537212d60
2023-04-17 15:39:02 +08:00
chunmao.guo
9558ed242c FIX: backup switch take effect
Change-Id: Ie9740d7f985ae6adc2778eaac0a80cf7a94c98c4
2023-04-17 15:39:02 +08:00
chunmao.guo
bda92795bb FIX: [STUDIO-1033] rm webview script handler on webview destory
Change-Id: I2e9390dfaad46da9e158a43026ef872aaf88d589
2023-04-17 15:39:02 +08:00
chunmao.guo
2a1f8af62e FIX: [STUDIO-2547] import config yes/no to all
Change-Id: Ib5812c4af3d9fcbe45fe1d884a8bcf29d2f4f704
2023-04-17 15:39:02 +08:00
MusangKing
ee6bf4d4de NEW: Allow Top/Bottom_z_distance under variable layer height
Allow user to set top/Bottom_z_distance under variable layer height.

Fix the bug STUDIO-2454

Change-Id: I026098a4df7cfa01f87a6802e2c787fcfd6df3ee
(cherry picked from commit 6e933acec7cde705f176937038ce307bc276cf5f)
2023-04-17 15:39:02 +08:00
MusangKing
355dd8d463 ENH: Re-open pattern angle option under Support/Advanced
Re-open this option as requested by github users.

Fix Jira STUDIO-2083; Github issue-1102

Change-Id: Ifb01a5153e7dc105bf2d29a98e64dda3a9d8e6d4
(cherry picked from commit e42914b2448c2693d19d40b0d84e64567b766f37)
2023-04-17 15:39:02 +08:00
Arthur
af0fca211b ENH: add grid & rectilinear_interlaced interface pattern
Github: #1018, #1221
Jira: STUDIO-2534

Change-Id: I8c766b5b934364253c0344e39f474e4ac3b81add
(cherry picked from commit e7d46fe60856ab511905b46799943bfde8a71826)
2023-04-17 15:39:02 +08:00
qing.zhang
9309831d26 ENH: update machine_start_gcode
turn on HB fan before setting the nozzle temp

Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I55908465055dcd93d274c1d861715cf7b9cbe655
2023-04-17 15:39:02 +08:00
zhimin.zeng
518cd4ce27 ENH: recover CutToParts for cut
Change-Id: I5d7fb089c5d2ea9d36fce3d70ec4da896d601940
(cherry picked from commit e0232b21ebf5a37bedee1c213d1c21890634c563)
2023-04-17 15:39:02 +08:00
zhimin.zeng
b1041a5de8 FIX: Cutting a sphere, the parts need repaired
STUDIO-1192 & STUDIO-2505

Change-Id: I2ad1d1ef7c279a7307654ba453a0d8323316904e
(cherry picked from commit cb6d9ed2074763b4f7f92e45219d942317adf402)
2023-04-17 15:39:02 +08:00
zhimin.zeng
872a54303c FIX: generate a wipe tower when add filament
STUDIO-2538

Change-Id: I8cca134eb9302b2ff30252ef36ed8c24c834b22c
(cherry picked from commit aeb5408c9eee844970bbef94e49978568c1de541)
2023-04-17 15:39:02 +08:00
zhimin.zeng
8ebd6cfc9e FIX: the text gap is not correct. STUDIO-2518
Change-Id: I27dc8b62962ebe1aa2b4d54e50d68cf173eecd54
2023-04-17 15:39:02 +08:00
tao wang
bf08a0b2e2 FIX:fixed some ui issues
Change-Id: I96f3e3ec56a07a7b5ca4723c92715df58e0baaf6
2023-04-17 15:39:02 +08:00
tao wang
7142119f03 NEW:add symbolic description for units optionin preferences
https://github.com/bambulab/BambuStudio/issues/1459

Change-Id: Ia16c1bb17378ec25a145dd0e7116df434b564e10
2023-04-17 15:39:02 +08:00
tao wang
ad70e58e14 FIX:fixed incomplete display of filament material names
fixed STUDIO-2464

Change-Id: I8310cc519d0143aa180109d70ebe25b0f068bd52
2023-04-17 15:39:02 +08:00
tao wang
8d6c56e4aa NEW:AMS control supports gradient color filaments display
Change-Id: I38d8a313d84b3acf643b489a1e62ebd073b35c1d
2023-04-17 15:39:02 +08:00
miaoxin
d43c7d5c92 NEW: add gcode conflict checker
1. add gcode conflict checker
2. add a new command line option: --no_check. When it's provided, gcode
   conflict check is skipped.

Change-Id: I6feafca8c5fa6c3c5eae1f0e541ce59d2f03dedf
(cherry picked from commit 5a39afb64e826a960d9673dcada89d02d62b3911)
2023-04-17 15:39:02 +08:00
Stone Li
36e0cc0b12 ENH: optimize track logic
Change-Id: I1fea7eb9681389924c32f3754fc77ee21a3ab898
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-04-17 15:39:02 +08:00
Stone Li
0a1c597da0 NEW: add track for cmd ack
Change-Id: Ibf2c9874bfac0b7a83506a7de2418ef8f3650dc3
2023-04-17 15:39:02 +08:00
zhimin.zeng
5bb35c3086 FIX: German Umlaut's not usable (3D Text Tool) STUDIO-2515
Change-Id: I193cb00f86476ed9088d69426ed17816a9df8de5
2023-04-17 15:39:02 +08:00
zhimin.zeng
24657f9145 FIX: negative volume scaling error when the instance is scaled first
Change-Id: I47b329123cb2b021a388fb1dbbcfe8c4cc927bc7
2023-04-17 15:39:02 +08:00
lane.wei
82d10c34e0 ENH: improve the send all logic
if has one plate with valid gcode, let the send_all success
https://jira.bambooolab.com/browse/STUDIO-2355

Change-Id: I9f022604e354560fea67d2914294391194e5234f
2023-04-17 15:39:02 +08:00
lane.wei
9e077b2e65 ENH: refine some logic when loading 3mf
1. old 3mf judge logic improvement
2. some 3mf doesn't include gcode and geometry, treat it as empty
   project

Change-Id: I9b3f3d04e32ae6ff273ec1ae04c04ac6329487f0
2023-04-17 15:39:02 +08:00
wintergua
0b1ccb8708 ENH: improve the efficiency of grouping volumes during brim generation
the processes are parallized via tbb
the patch 12311 ENH: remove trim_overlap should be used

Change-Id: I226dc171daadebd81b8d3ae013b08c71b91fb392
(cherry picked from commit eaa2e7997a59f43175d5af430269127471e40cbb)
2023-04-17 15:39:02 +08:00
zhimin.zeng
96d2882b8d FIX: wipe tower is not generate when insert custom gcode
Change-Id: I2e21955e4a29b0ee1aa3150f26ccef4db5850413
(cherry picked from commit 677151a26c9724993bad6d802015e76a700555f4)
2023-04-17 15:39:02 +08:00
zhimin.zeng
34f52b213c FIX: modify the camera command of P1P smooth timelapse
P1P use its own layer_change_gcode

Change-Id: I3f640a8d6fdc4481460e0f5aca33cd1ebf3de5ab
2023-04-17 15:39:02 +08:00
zhimin.zeng
752c145384 FIX: Multiple text generated failed. STUDIO-2522
And support generate text on the outer surface of the assembly.

Change-Id: Iebe0b47b3f85c3800c799c4b5800514c0f2838fb
2023-04-17 15:39:02 +08:00
Arthur
1ac8013fa5 ENH: improve normal support's efficiency
Similar to tree support, make as many steps parallel as possible.
Jira: STUDIO-2525

Change-Id: Iee310bbf6911d8d3e4262ee8ed6bd133d09670a9
(cherry picked from commit 3798f1a3ecb85bbfb81925b3702fb4384e18994d)
2023-04-17 15:39:02 +08:00
chunmao.guo
ef1e4a132d ENH: [STUDIO-2446] support select media files by group of month/year
Change-Id: I10d26e34405a13daa477be011e7353d79232b4b3
2023-04-17 15:39:02 +08:00
chunmao.guo
2573d3c112 FIX: [STUDIO-2509] open self for new window on mac
Change-Id: I8fc5b810b00a089f35b914604c511201ae8e5d0b
2023-04-17 15:39:02 +08:00
chunmao.guo
c44a240ec0 FIX: [STUDIO-2511] handle dbl click in ComboBox
Change-Id: I27075e43de4a78446972806b57771f0880677935
2023-04-17 15:39:02 +08:00
chunmao.guo
1966946256 FIX: [STUDIO-2489] Monotonic vs monotonic line wrong icon
Change-Id: Icb50527ed924e82cb6d3508117ebe09781d8b2d1
2023-04-17 15:39:02 +08:00
liz.li
b193566996 FIX:Canvas focus (STUDIO-2384)
https://github.com/bambulab/BambuStudio/issues/1465
https://github.com/bambulab/BambuStudio/issues/1339
two enhancement:
Moving mouse cursor to GLCanvas shouldn't cause focused parameter textbox lose its focus.
When GLCanvas lose focus, the imgui textInput should lose focus too.

Change-Id: I616bb98f87c2dc59669220d3b5a6c3e120a8f06f
2023-04-17 15:39:02 +08:00
liz.li
3f2ee4062b ENH: zooming at mouse position
https://github.com/bambulab/BambuStudio/issues/1321

Change-Id: Ifa5c2b2931a5d80c3e5e5cc05eda76263a5ac570
2023-04-17 15:39:02 +08:00
tao wang
01bb20e4e1 ENH:default button for wxwidget adds dark mode style
Change-Id: Idfb3b379c97f10f6aa9a4cf6ae18e6dfcc8cff3a
2023-04-17 15:39:02 +08:00
Arthur Tang
617cb5490b ENH: tree support style default to Tree Hybrid
1. tree support style default to Tree Hybrid
2. fix an assert bug with MedialAxis::build:
    assert(polyline.width.size() == polyline.points.size() * 2 - 2)
  This is caused by the incorrect clear function of ThickPolyline.

Change-Id: I8d6507ad366d253493e2749e0cbac8d3d837ee8a
(cherry picked from commit bd31e962c11e82005944bef40b17471075e79898)
2023-04-17 15:39:02 +08:00
lane.wei
d7364900dd ENH: log: reduce the status log level to reduce log under cli
Change-Id: I7ab839ce02c22fb48c32b52184649fb951efbe95
(cherry picked from commit 2f1f2bedaf5420ceda3d2f29b7e44a1cc863ccac)
2023-04-17 15:39:02 +08:00
manch1n
797c211203 ENH:allow more same color objects arrange together
Change-Id: I87a9de3c5ed540c87fdebfe4e69ffa539d78ce40

STUDIO-2462

STUDIO-2463
2023-04-17 15:39:02 +08:00
Stone Li
1f1e5894bb ENH: add sec_link field to start_bind
Change-Id: Ia48592f096b14ea0fe4de20126287c6f885d73a5
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-04-17 15:39:02 +08:00
zhimin.zeng
e031708043 FIX: translation for cut
Change-Id: I31f755b857f07e920fe6e50d48f4aa34a53e07da
2023-04-17 15:39:02 +08:00
gerrit
292f7e2c21 ci: update build version to 01.05.00.62
Change-Id: I89651401a9397e1221f3367ee6204f8212d70c7b
2023-04-17 15:39:02 +08:00
liz.li
5b2ef59c9f ENH:rotate object by pressing page down and page up
Change-Id: I888f7c71655548085cd15fe88b16087cf115933a
2023-04-17 15:39:02 +08:00
gerrit
1a71757332 ci: update build version to 01.05.00.61
Change-Id: Icc5832f25e2c533f5ed3eba87ebfb743462c91f5
2023-04-17 15:39:02 +08:00
arthur.tang
6c489808a7 ENH: boost is_support_necessary's performance
1. Parallelize the majority of overhang detection, leaving only a small
part of sharp tail detection as sequential. This strategy makes
is_support_necessary 10 times faster.
2. Use the overlaps function to detect overlapping, instead of using
intersection().empty()
3. Control the max recursion depth to prevent crashing due to too deep
recursion.

Jira: STUDIO-2445, STUDIO-2458
Change-Id: I35283da3e4a22d7afe251b804ce30b90a9d754df
(cherry picked from commit 1a6fedd1a0c82906f1807234ea1b816247ca6fd7)
2023-04-17 15:39:02 +08:00
liz.li
6f298ac6f1 ENH:add track events
Change-Id: I7fb685013f243d6394a94a3c9500016b247ea0a8
2023-04-17 15:39:02 +08:00
yifan.wu
c582e64e0d FIX: remove trim_overlap to avoid perf issue in some cases
Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: Id6f54b0421cfdd070971d69a2ed110b7b6430dee
2023-04-17 15:39:02 +08:00
salt.wei
0b126dbed6 ENH: fix the floating layer issue
Fix for floating layer under multi-color
printing while z_hop is zero.

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I8cc96bd18020cac8424fe4c3e62fb87da118b826
2023-04-17 15:39:02 +08:00
tao wang
679ccb658b FIX:fixed will create crash logs when open object table
fixed STUDIO-1983

Change-Id: I1f83f16fdc0677f0d00e79508779584789aaa6fa
2023-04-17 15:39:02 +08:00
tao wang
ccfc61492b ENH:use high contrast icons in dark mode
fixed STUDIO-2033

Change-Id: Ibfbc40b02f5333d80d2875d88bb3029109256e4a
2023-04-17 15:39:02 +08:00
tao wang
c6e49af3fe ENH:add some protection for fan control
Change-Id: Ic60deaec60b5238f9307b7b4bb928293701c2fd5
2023-04-17 15:39:02 +08:00
tao wang
03819e6f86 ENH:disable switching printers when sending printing
Change-Id: I9004f3de4f0968cc659a769970ff20c1e7f6f0be
2023-04-17 15:39:02 +08:00
tao wang
47c04e75a7 NEW:use new humidity img
Change-Id: I8e5b68f929e2638d9c94bab3d9ed6b8d7133d586
2023-04-17 15:39:02 +08:00
zhimin.zeng
c8729bec8f FIX: First layer nozzle temperature not working
STUDIO-2409

Change-Id: I4a31be809bbf677d0e029c6cdca6b21fd04d066a
2023-04-17 15:39:02 +08:00
zhimin.zeng
dda90b1810 ENH: get start_gcode filament
Change-Id: Ia511f758d5c59ddc38c79f251e8c95511de4a235
2023-04-17 15:39:02 +08:00
zhimin.zeng
81daebb5a5 FIX: the first layer is not printed in the correct order
Change-Id: Ia8ad49417e6b59fa10b763cb0e207f5f79b9a4d2
2023-04-17 15:39:02 +08:00
Stone Li
c9635174bd ENH:display info when in slicing queue
Change-Id: I0dc2645e5679af310c8c0558c8ae47c9d62958e1
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-04-17 15:39:02 +08:00
tao wang
d9395e6405 ENH:optimize the switching of multiple AMS and vams
Change-Id: I031e3248164aa2fc243c6ebf7418c535119e7ffc
2023-04-17 15:39:02 +08:00
tao wang
7481da52d6 NEW:support for launching studio from the model web
Change-Id: I931fc8633c057228441daf2ab4c9c37f97e898ab
2023-04-17 15:39:02 +08:00
zhimin.zeng
6f141ea740 FIX: crash when open 3mf file
the volume type is unreasonable, causing the array to go out of bounds

Change-Id: I316b05f277f894b1fd32cda3eca29340d988e01e
2023-04-17 15:39:02 +08:00
tao wang
60f524167d ENH:optimize ams material settings
Change-Id: I1c6c57570fc7ba37d45854297e30182a0ffcaad4
2023-04-17 15:39:02 +08:00
zhimin.zeng
cd4cddfca4 ENH: Cut optimization, support for custom connectors
Change-Id: I65163314374fb74f0b16df47dacae82caa6fab0d
(cherry picked from commit 7bacc2c2a89be471f6fee51dd07a42222a28b55a)
2023-04-17 15:39:02 +08:00
Stone Li
9f71a8c5dd FIX: fix third-party login
Change-Id: Ib4699ecec1a6c72a9bc4967751d07b75f6b52d3a
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-04-17 15:39:02 +08:00
salt.wei
03e031fe5c ENH: fix hang issue for archimedean chords pattern
This is fix for STUDIO-2079 that slicer may hang
when generated archimedean chords pattern lines.
Thanks prusa.

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I923c1ef48f093b2ab9576cb04beb4787c903ca00
2023-04-17 15:39:02 +08:00
zorro.zhang
223291452b FIX: Some bug in modelinfo webpage
Change-Id: I182fd0006f92975018012cb52a7093373153f80e
(cherry picked from commit c8341df9b548c0eed8769cb6b6dc80aab10b8827)
2023-04-17 15:39:02 +08:00
salt.wei
61b271f379 ENH: fix for STUDIO-881
Thanks prusa

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I2e1c1088d29dd5401016ca41d3ed6dec87e0acd1
2023-04-17 15:39:02 +08:00
zorro.zhang
b4ffa91cb4 ENH: model info display UI
Change-Id: I066c0e7f8ce87ec00b1141a1b44430444a819b42
(cherry picked from commit 05907a1a42da82737090d55046974d401f8af057)
2023-04-17 15:39:02 +08:00
qing.zhang
0cc953ad41 ENH: speed up one wall top generate
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I141565bea3ca4d3fbcc9569b175af5d4f5cdd40e
2023-04-17 15:39:02 +08:00
Arthur
246ff2653d ENH: improve bridge direction detection
Thanks to Prusa.
Jira: STUDIO-2453

Change-Id: Iadcc59df44d5abc552f5d558a500fd9bcd66d43f
(cherry picked from commit c19156fd037df4231f3e0cb1e9a899c9b7525372)
2023-04-17 15:39:02 +08:00
chunmao.guo
dbe1f3f5b1 ENH: [STUDIO-2437] new object sinking interaction
Change-Id: Ia93f3ee92abc7cd2ff5d623c6e1edfe7233e31d4
2023-04-17 15:39:02 +08:00
chunmao.guo
0ce72dfcb7 ENH: Revert "remove the sinking logic"
This reverts commit 17dded5d4aa54a330174788f3d6fbd583f63f8e1.

Change-Id: I51816d8357076a07c500a1bd006b08c15d7467e6
2023-04-17 15:39:02 +08:00
chunmao.guo
00a815e507 FIX: use ppath tag in main 3mf model
Change-Id: I9a91eaa80f4fe5640aec0c954b6b22b144a1812c
2023-04-17 15:39:02 +08:00
Arthur
e4f6315da0 FIX: update_sequential_clearance may crash due to clipper's bug
m_hull_2d_cache must be set since later on we'll use its point number, which is a very large number when not inited.
This will cause a fatal out-of-memory error.

Jira: STUDIO-2452
Change-Id: I9b397a53bdcdf555eccf745f1b96786010ebe309
(cherry picked from commit 6802be53709649e75a1562d29e14559c766d427b)
2023-04-17 15:39:02 +08:00
tao wang
304e29529b ENH:optimize ams ui layout and add vams load/unload display
Change-Id: I17db70fe01f3fd00b60804e9a076248eb14fa845
2023-04-17 15:39:02 +08:00
chunmao.guo
8be8f20f75 FIX: [STUDIO-2364] use generic render for item selection
Change-Id: Iebda6269b736e25802798fcc128230d4bb87c760
2023-04-17 15:39:02 +08:00
Arthur
aebbe807f2 FIX: update_sequential_clearance may crash due to clipper's bug
offset may give empty results.
The previous patch solved the issue that the studio crashes immediately when selecting by-object printing.
This patch solves the issue that the studio crashes when moving objects with mouse after selecting by-object printing.

Jira: STUDIO-2452
Change-Id: Iacd69e67386b0750f24e5af2799ff9c0da130e88
(cherry picked from commit 8ea4379d0b6d61e91bd6704e4b1e8309cb42b924)
2023-04-17 15:39:02 +08:00
Arthur
f227a8f8da FIX: sequential_print_clearance_valid may crash due to clipper's bug
offset may give empty results.

Jira: STUDIO-2452
Change-Id: I4da9689dc3e22afcb2340ce0f9956237e4aab434
(cherry picked from commit 3f33979a79c720fcaddb5b850ec278b3deaf2417)
2023-04-17 15:39:02 +08:00
zhimin.zeng
c098e01b22 FIX: modify plate print sequence, the wipe tower is not update
STUDIO-2279 STUDIO-2280

Change-Id: I9a65ae4c02afc48666131b37d0282d59aa25c560
2023-04-17 15:39:02 +08:00
salt.wei
ad43a54e3d ENH: fix compiling issue
Don't know why this file is missing when cherry-pick...

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: Iddfba50ef885fa08078bb9723a6ae2d5d5d0289d
2023-04-17 15:39:02 +08:00
lane.wei
c65a5f8bf5 ENH: thumbnail: add top_view thumbnails and picking thumbnails
1. add top view thumbnail for each plate
2. add picking thumbnails for each plate
3. save model object id for picking

Change-Id: I1d7f6ade22726ff12c282cb12e4a78e6b444a070
2023-04-17 15:39:02 +08:00
chunmao.guo
9f3a89320b FIX: [STUDIO-1033] rm webview script handler on webview destory
Change-Id: If1465ba6bf997bf17b8a33bc33d0f20d34fcbdc7
2023-04-17 15:39:02 +08:00
chunmao.guo
db65fd6e83 FIX: [STUDIO-1940] hide edit ctrl on scroll in ObjectList
Change-Id: I9936ecff241d468f14e3dda0c12e4458cad8c237
2023-04-17 15:39:02 +08:00
chunmao.guo
bd29ac769c FIX: [STUDIO-2295] update dynamic filament list on color change
Change-Id: I6a90e3ed6007b41ea38b50fac96b929d058dddfa
2023-04-17 15:39:02 +08:00
chunmao.guo
89fc178dd0 FIX: [STUDIO-2425] default filament color
Change-Id: I85871885e5e6976e6479410a93a5f14ccd61a8cd
2023-04-17 15:39:02 +08:00
chunmao.guo
670114c1b3 FIX: [STUDIO-2289] impl processname on linux
Change-Id: I0acb5e002b5c945bb8ca6272ad95d602fde17cfb
2023-04-17 15:39:02 +08:00
tao.jin
0f152c635c FIX: [STUDIO-169] handle text baseline on Mac
Change-Id: I13bde2dcd6d19107f5fe6fb66aa35d2aa55ab03d
2023-04-17 15:39:02 +08:00
chunmao.guo
cc994a3492 FIX: [STUDIO-2241] show error dialog later for param value error
Change-Id: I16ffc92cb0701b8e3d984b783618549a5b237f70
2023-04-17 15:39:02 +08:00
tao wang
d352677f08 ENH:modift the title of options in ams settings
Change-Id: Ib5ed8b402713124561c1e1a285b3f1db46d00725
2023-04-17 15:39:02 +08:00
tao wang
252f035d51 FIX:fixed the wrong radio state of saving preset
Change-Id: I9b185b79fd39654decd2cf2aa900b79ac3d23e61
2023-04-17 15:39:02 +08:00
tao wang
a11cce7b26 ENH:optimize ams humidity display
Change-Id: Ied40225c6618d6961f5fd8c357bb227b512437ea
2023-04-17 15:39:02 +08:00
salt.wei
0c00243cbf ENH: remove useless code
Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I1dca5e366c2c681a4137c2187ecc7d59663e3b86
2023-04-17 15:39:02 +08:00
salt.wei
31f8034422 ENH: force to use . as decimal point
"std::cout << float number" is unsafe which
may use , as decimal point when switch language.

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I8a379117168eab0111dc93987b1d6130a741ade6
2023-04-17 15:39:02 +08:00
lane.wei
4651927869 FIX: CLI: fix the filament_type not correct issue for support-w
1. filament_type not correct in slicedinfo
2. missing serveral information in bbox

Change-Id: I0393ebc887591548a5a1d883661b28876b9ede6e
2023-04-17 15:39:02 +08:00
qing.zhang
cafd8e7f7e ENH: modify temperature_temp of PET-CF
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I2e361b79620cbc5e7df7d5a657f8b26e285d3538
2023-04-17 15:39:02 +08:00
qing.zhang
a8488f65b2 ENH: add Bambu PET-CF & modify slow down layer time of Bambu PLA-CF
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I8396840eca762def30cb794f4c29808f2f71adfa
2023-04-17 15:39:02 +08:00
salt.wei
1278cbf461 ENH: remove tbb simplify in gcode export
Useless after importing AABB tree.

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: Iaec9bef4a2a6bc4d097c6fd75720cb69d9cf314f
2023-04-17 15:39:02 +08:00
liz.li
db86541df7 FIX: show label function display chinese incorrectly STUDIO-2097
https://jira.bambooolab.com/browse/STUDIO-2097

Change-Id: Ia2e213b08e184c0363a30967f84e7cb5e3bb3642
2023-04-17 15:39:02 +08:00
salt.wei
4c4b274408 ENH: speed gcode export up again
thanks prusa

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: Ifbe5e2ea55b16a7fe281b54ca16c37695c15f5b1
2023-04-17 15:39:02 +08:00
chunmao.guo
c945c47383 FIX: [STUDIO-2150] export config not work
Change-Id: I05915a9dc5e767273e09ecdebaf5a679435c080f
2023-04-17 15:39:02 +08:00
chunmao.guo
2bb8875e30 FIX: [STUDIO-2213] project title of restored new project
Change-Id: Ia8255016f77942274c9cf4f704115766735a820b
2023-04-17 15:39:02 +08:00
chunmao.guo
8292486c3a FIX: [STUDIO-2064] back color of list view editor on macOS dark mode
Change-Id: Id6ea9b17b83ccb08fe911d62d8fd292358a20ebc
2023-04-17 15:39:02 +08:00
chunmao.guo
91ad491743 FIX: [STUDIO-2282] auto expand filament list on sync ams
Change-Id: Iad2fd419fc6da56418cda7423adcbcef641ee2a3
2023-04-17 15:39:02 +08:00
chunmao.guo
68c9cb0a8c FIX: some config param range
Change-Id: Ia19f51e121bd1966e35efef1127d685b07ca676f
2023-04-17 15:39:02 +08:00
Stone Li
65db26a27d NEW: remember use options when printing
JIRA: STUDIO-2396

Change-Id: I21e6f91e3da53adf8dc28d9be223e03a4a275fca
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-04-17 15:39:02 +08:00
Stone Li
55f3e51bf4 ENH: add translations for Search
JIRA: STUDIO-1985

Change-Id: I39d0eddfc1aa957ecdbe35b9093bceb5c770c224
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-04-17 15:39:02 +08:00
Stone Li
6827b41eb3 NEW: add track events for debugging network
Change-Id: I671f91b4af00277236ca71014f8d667109756d00
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-04-17 15:39:02 +08:00
lane.wei
bd75af4a43 ENH: Linux: set BBL_INTERNAL_TESTING to 1 for release build
Change-Id: I1545636c9e9714b44124ea0ddf18ef39f277a2b8
2023-04-17 15:39:02 +08:00
qing.zhang
4adfb71115 ENH: add Bambu PETG-CF & change filament id of PLA Silk
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: Ib62b479a2a6648a2a4bfa0d3deb11f6f37f754a4
2023-04-17 15:39:02 +08:00
tao wang
311d9c3481 NEW:the model mall is opened using the default browser
Change-Id: I9f855288486196b2a7c72c51bee8cfcf408ceab8
2023-04-17 15:39:02 +08:00
chunmao.guo
7eb3aa8104 FIX: privacy dialog dark mode (STUDIO-2345)
Change-Id: Icd44d4b83bd9785869f68c04e6d4e38524e4b46a
2023-04-17 15:39:02 +08:00
chunmao.guo
a401c0fa2e FIX: [STUDIO-2340] [STUDIO-2297] handle linux gstreamer error
Change-Id: Iadc6dcb9d7a9f2c5d1ce9cf979bbbfbd0f805d19
2023-04-17 15:39:02 +08:00
chunmao.guo
0e3364a415 FIX: [] not unload user presets on app closing
Change-Id: I517366d0cddab9c073db7bf70fec8f59d7d39e3c
2023-04-17 15:39:02 +08:00
Stone Li
365eacc7cf ENH: add translation for choose color dialog
Change-Id: Ic59286939fcf5a9905950c249ee3e9b03a55398e
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-04-17 15:39:02 +08:00
yifan.wu
fc25754c2c ENH: support smooth timelapse for C11
Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: Id9da6654fe26c0bda6a9a7dae1e5601e2d944a57
2023-04-17 15:39:02 +08:00
Arthur
017707e575 FIX: sharp tail detection may fail
1. In small overhang detection, some sharp tail cases are missed because
  the max_layer was not compared.
2. In normal support, previously the lower layer's expolys were not right,
  should only keep the ones that won't vanish when extruding.

Jira: STUDIO-1977, STUDIO-2200
Change-Id: Ia09ff1ab4870b7e3c199a827932536867644c76c
(cherry picked from commit e3ba3a3114821e951d6eb00b4c95e6e63ffe00d4)
2023-04-17 15:39:02 +08:00
lane.wei
dce7751750 ENH: param: remove redundant values in fdm_common
Change-Id: Ie23377db59196edc1857071b91889e2165e63127
(cherry picked from commit 84dc9d988decae3164c084a6b579522276cb4010)
2023-04-17 15:39:02 +08:00
gerrit
a8d98d87ae ci: update build version to 01.05.00.60
Change-Id: I3887ba41bce97454001005ace28951cbf81ec91a
2023-04-17 15:39:02 +08:00
liz.li
1beee1eebf FIX: .gcode file shall disable preview menu (STUDIO-2320)
https://jira.bambooolab.com/browse/STUDIO-2320

Change-Id: I54cd49a49a8b08916872eae75534ef4c1d915cb5
2023-04-17 15:39:02 +08:00
tao wang
ede8a2dc30 ENH:disconnect lan mode printer when switing other printers
Change-Id: Ibd2d80e248b8a25a103cec75fdc9cd11b84e8b48
2023-04-17 15:39:02 +08:00
qing.zhang
fdd659cefe ENH: speed up the wall generator process by using bounding box
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: Ifccbb33bc6df28136746f98020ef2cad002b5868
2023-04-17 15:39:02 +08:00
liz.li
aba824bbb9 FIX: press key R and T cannot close gizmo window (STUDIO-1980)
https://jira.bambooolab.com/browse/STUDIO-1980

Change-Id: Iaebe4674cf3b14dde4e7ee1a9b123b5a36d2c693
2023-04-17 15:39:02 +08:00
liz.li
289a3d1d53 FIX: crash at fix model (Studio-1482)
deselect all objects when select plate in objectList.
https://jira.bambooolab.com/browse/STUDIO-1482

Change-Id: I3660108ba1d8f369afd5058f086cb7daf306ea59
2023-04-17 15:39:02 +08:00
tao wang
a86d94f2c9 NEW:update the content of the project page
Change-Id: Idb7f8a2564c78a1f062580f6b388ee033238cedf
2023-04-17 15:39:02 +08:00
MusangKing
4cb8b1e125 ENH: Re-open support independent layer height
Allow user to disable support independent layer height when prime tower closed.
Fix wrong WIKI link jumping.

JIRA: STUDIO-1685
JIRA: STUDIO-2308
Change-Id: I894fdd37b707c53e17fd4ad7d1518897f307e557
(cherry picked from commit e10d31e123306a0893087ea03693303768a2daf6)
2023-04-17 15:39:02 +08:00
wintergua
ee3e8fc515 ENH: restore inner and outerinner brim modes
1) the function is not released to public

Change-Id: Ia1b5a31db3b1b1864997b57fe875c01f3ea9fb08
(cherry picked from commit a816cc313659f87978e1275b98f43172cb416a59)
2023-04-17 15:39:02 +08:00
lane.wei
23db223364 ENH: CLI: adjust the thumbnail size to 512
Change-Id: I79c8d584b23e7d4d9c27ce1859b322d9fddebc90
2023-04-17 15:39:02 +08:00
liz.li
e657f54a6d FIX: fix a link url error
Change-Id: Ie4c87383e043fc51adddabde1904b03af585181f
2023-04-17 15:39:02 +08:00
lane.wei
088f2a4ace ENH: cli: add pre-check logic when slicing all
Change-Id: Ib13a5dd11175c0835b7a1362317941aa6a04474b
(cherry picked from commit a6f7ad231e5694ce12f9fd34518425f31c3bb5bd)
2023-04-17 15:39:02 +08:00
zhimin.zeng
b2c457eec6 FIX: Selected shadow position is not correct in assembly view
Change-Id: If727e8f70dc85fb256cad6d9de9bb4913cb11896
(cherry picked from commit a3540aa72566a6606ee3533b4770d010d1edd58c)
2023-04-17 15:39:02 +08:00
zhimin.zeng
0532f837fa FIX: wipe tower is not generated when inserting custom gcode
Change-Id: I8f81dff79dba2fd60df2095ff37696ddc0b9597c
2023-04-17 15:39:02 +08:00
zhimin.zeng
ebaf87f033 FIX: The paint on the top surface is embedded in the sparse fill
Change-Id: I5e95bd22684d79413322fce2924fa4ff8f668c0e
2023-04-17 15:39:02 +08:00
salt.wei
8669291aad ENH: optimize speed of gcode export
Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: Ic641352623f26c7241ae5720ad1baa202a1b00c7
2023-04-17 15:39:02 +08:00
miaoxin
3448b7a053 FIX: avoid arrange to outer when quick click autoarrangement in plate.
Change-Id: Ic8fa2f605094c7a3b7fa5a6fe36c5159678c50fd

STUDIO-2202
(cherry picked from commit 641c18c25f5f297234059d463ac12220c4b6fa9f)

Change-Id: Ic452f2fa4357fcacf71f6a70df2c514d2628b217
2023-04-17 15:39:02 +08:00
wintergua
4c93d6e59d FIX: Brim may not generate with a large positive xy compensation value
studio-2344

Change-Id: I74e91ccae8465ab747f2ed7e95e3d2694238c407
(cherry picked from commit a076c0541e88c68b11cf3b91725da6f8421c405b)
2023-04-17 15:39:02 +08:00
lane.wei
662453f419 ENH: add the time limit and triangle limit for cli slicing
Change-Id: I80d6e58dca6648427dbe4cfbc01eabdedfa79f52
2023-04-17 15:39:02 +08:00
lane.wei
6fab32c98b ENH: backup: add logic to cleanup directory under cli
Change-Id: I7a846e362f45d1c7e34bef59be3b2c312799d0d2
2023-04-17 15:39:02 +08:00
Stone Li
dbe61652c7 ENH: give a tips when printer model is different
Change-Id: I387f2dd74e80efc4c0fbbd5d39faeb29ac2a9581
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-04-17 15:39:02 +08:00
SoftFever
4a288c617c refactor global to plate translation 2023-04-17 00:12:57 +08:00
SoftFever
e74d366791 fix bed mesh for multi plate 2023-04-16 22:06:37 +08:00
SoftFever
656101dc79 set default filament_colors in app config 2023-04-16 21:54:33 +08:00
SoftFever
661e79ca8c tweak name pos 2023-04-16 17:02:19 +08:00
SoftFever
1852dec00e Merge pull request #760 from CoryCharlton/main
Revert the default filament color change
2023-04-16 16:40:22 +08:00
Cory Charlton
60adc6c5dc Merge pull request #1 from CoryCharlton/CoryCharlton-issue-759
Revert the default filament color change
2023-04-15 11:11:05 -07:00
Cory Charlton
35725a23e6 Revert the default filament color change
In commit c7dbf848a6# the default filament color was changed. This reverts that change in order to implement #759
2023-04-15 11:10:10 -07:00
SoftFever
44df0d8308 1.6.2-beta 2023-04-16 00:39:20 +08:00
SoftFever
e7ee0effa2 FLSun V400 2023-04-15 23:25:31 +08:00
SoftFever
d4b59ff52b optimized image size 2023-04-15 23:25:13 +08:00
SoftFever
7f12c18a4a support custom bed texture and model
#83
#685
#695
2023-04-15 01:37:46 +08:00
SoftFever
9671cdfc68 increase nozzle_diameter limitation
#752
2023-04-15 01:19:30 +08:00
SoftFever
8127f27d79 fix build error on Windows 2023-04-14 00:57:34 +08:00
SoftFever
f5d82ee906 fix wrong object polygon for non-first plates
#668
2023-04-13 19:51:00 +08:00
SoftFever
099ed10144 Fix Windows icon res 2023-04-12 17:05:23 +08:00
SoftFever
c25ac3829f Merge branch 'main' into feature/delta 2023-04-11 23:16:20 +08:00
SoftFever
a731241e9c fix crash when undo/redo 2023-04-11 23:12:56 +08:00
SoftFever
b8c79d029a fix patch 2023-04-10 23:54:22 +08:00
SoftFever
75567f3c3c update deps 2023-04-10 23:53:46 +08:00
SoftFever
65e397767c optimized plate name location 2023-04-10 22:54:06 +08:00
SoftFever
07d048ef36 USE_PRIVATE_FONTS 2023-04-10 20:44:20 +08:00
SoftFever
ef3614a21a optimize icon position for circle bed 2023-04-10 18:55:14 +08:00
SoftFever
4976e4f91f Merge pull request #665 from hliebscher/lang_de_fix
fix typo
2023-04-10 17:47:28 +08:00
SoftFever
ab6a77ddf3 Merge pull request #663 from hliebscher/j1
Add Snapmaker J1
2023-04-10 17:46:49 +08:00
SoftFever
cb22560d38 fix an issue that time estimation is written twice for 3rd party printers 2023-04-10 11:44:53 +08:00
SoftFever
87ba3263cc fix default bed triangles and check_outside & intersect_instance 2023-04-09 22:16:36 +08:00
SoftFever
0d20f13196 Revert "wip"
This reverts commit 35d8c101fb.
2023-04-08 10:45:42 +08:00
SoftFever
1dec3fe9cb Merge branch 'main' into feature/delta 2023-04-08 09:21:35 +08:00
Heiko Liebscher
793b6d2006 fix asa and petg 2023-04-07 23:29:44 +02:00
SoftFever
3f7ed3829c Fix top/bottom flow rate bug #680 2023-04-07 22:15:50 +08:00
SoftFever
35d8c101fb wip 2023-04-07 13:40:17 +08:00
SoftFever
094611a17c del old model 2023-04-07 11:14:18 +08:00
SoftFever
5c9012b967 Merge branch 'main' into SoftFever
# Conflicts:
#	.github/workflows/build_linux.yml
#	src/slic3r/GUI/GUI_Factories.cpp
2023-04-07 11:12:04 +08:00
Heiko Liebscher
5a2606a289 j1 idex filament start end code 2023-04-06 16:30:00 +02:00
SoftFever
17d6e63cf9 bump up version 1.6.1 2023-04-06 16:59:24 +08:00
Heiko Liebscher
078f240995 fix typo 2023-04-06 10:09:27 +02:00
Heiko Liebscher
970d31c058 fix version 2023-04-06 09:59:33 +02:00
SoftFever
0c8b596c48 update klipper config 2023-04-06 15:52:32 +08:00
SoftFever
f983610827 enable aux part cooling fan by default for Bambulab P1P 2023-04-06 15:42:35 +08:00
SoftFever
23165b8f3e fix Malformed command issue for Klipper 2023-04-06 15:39:02 +08:00
SoftFever
5d1c36c7d4 update OrcaCube v2 2023-04-06 15:38:08 +08:00
Heiko Liebscher
d9cdafbaa0 fix filename 2023-04-06 08:47:53 +02:00
Heiko Liebscher
5c439c4acc fix typo 2023-04-05 22:37:31 +02:00
Heiko Liebscher
81a0edbf3f fix profile 2023-04-05 19:53:14 +02:00
Heiko Liebscher
be71e50be7 fix j1 pla settings 2023-04-05 17:52:31 +02:00
SoftFever
8206a54cb3 linux! 2023-04-05 23:28:33 +08:00
SoftFever
9eebb143db 1.6: linux cicd 2023-04-05 23:26:19 +08:00
SoftFever
51ef90c54e fix an undo/redo bug for plate name 2023-04-05 23:22:51 +08:00
SoftFever
65963b465b 1.6
fix duplicated menu items
2023-04-05 22:34:42 +08:00
Heiko Liebscher
da558a8aea set version 1.5 2023-04-05 16:33:20 +02:00
SoftFever
70a0f5f77d try fix linux cicd 2023-04-05 22:17:05 +08:00
SoftFever
7edef28bbc add Orca Cube V1 2023-04-05 22:17:05 +08:00
SoftFever
5ee3009adc Merge branch 'main' into SoftFever 2023-04-05 22:17:05 +08:00
SoftFever
62556df685 Merge pull request #645 from hliebscher/cz
add czech language (user request)
2023-04-05 22:05:34 +08:00
SoftFever
4446ae86ec try fix linux cicd 2023-04-05 22:03:19 +08:00
SoftFever
7d582a9455 add Orca Cube V1 2023-04-05 21:43:36 +08:00
SoftFever
0ab05bacb7 Merge branch 'main' into SoftFever 2023-04-05 21:42:24 +08:00
Heiko Liebscher
f9f2148cf8 j1 id fix 2023-04-05 11:26:41 +02:00
Heiko Liebscher
f0f1608b5a add texture svg 2023-04-05 09:42:33 +02:00
Heiko Liebscher
cb57a3ed32 fix wrong svg 2023-04-05 09:41:57 +02:00
SoftFever
5c91516420 New feature: add handy models
3DBenchy: https://www.3dbenchy.com/
Voron Cube https://vorondesign.com/
Autodesk FDM Test: https://github.com/kickstarter/kickstarter-autodesk-3d
2023-04-04 23:13:06 +08:00
SoftFever
1826dee1cb attempt to fix linux build error 2023-04-04 21:39:33 +08:00
SoftFever
62c36f287c tweak calib lines rendering for Linux 2023-04-04 21:39:33 +08:00
SoftFever
814de36768 tweak plate name location for Mac and Linux 2023-04-04 21:39:33 +08:00
SoftFever
fd68138279 attempt to fix linux build error 2023-04-04 21:37:26 +08:00
SoftFever
ba2933d7d8 tweak calib lines rendering for Linux 2023-04-04 21:37:08 +08:00
SoftFever
26daac8958 tweak plate name location for Mac and Linux 2023-04-04 21:36:44 +08:00
SoftFever
166890db53 Merge pull request #633 from SoftFever/SoftFever
More changes for 1.6
2023-04-03 21:48:29 +08:00
SoftFever
8640025ef8 Stop mandatory temperature stetting commands in gcode for Klipper
#61
2023-04-03 21:42:06 +08:00
SoftFever
0d3b84b9d3 Keep project file compatible with BambuStudio
#599
2023-04-03 20:04:53 +08:00
SoftFever
1a281e99a6 Show help info of setting up connection 2023-04-03 20:02:55 +08:00
SoftFever
7816c93741 Unable to Export Config Files #622 2023-04-02 22:53:37 +08:00
SoftFever
615a317173 fix instance id 2023-04-02 22:23:23 +08:00
SoftFever
1c09fe5caa fix bug 2023-04-02 21:57:25 +08:00
SoftFever
6cb7d0de95 fix extruder_clearance_radius
#620
2023-04-02 20:58:49 +08:00
SoftFever
58f8093cf0 update locale 2023-04-02 11:42:31 +08:00
SoftFever
bf556a0272 New feature: show auto calibration marks on bed for X1/X1C printers
#88
2023-04-02 11:42:18 +08:00
SoftFever
c68fa18caf opti string for klipper connection 2023-04-02 00:21:16 +08:00
SoftFever
ad655a9f32 bump version to 1.6.0 2023-04-01 22:21:57 +08:00
SoftFever
c7dbf848a6 Set default filament color rgb(242, 117, 78)
Introduce secondary accent color rgb(242, 117, 78)
2023-04-01 22:20:53 +08:00
Heiko Liebscher
ade20ac962 fix czech 2023-04-01 13:38:48 +02:00
Heiko Liebscher
80904f0fc0 first init czech language 2023-04-01 10:46:03 +02:00
SoftFever
b85b514bd9 F5 key to reload printer view
#543
2023-04-01 15:04:23 +08:00
SoftFever
c3726d95c7 update locale file 2023-04-01 13:26:33 +08:00
SoftFever
22a24168e6 support Klipper Exclude objects natively.
Also remove fake slicer info
2023-04-01 13:25:55 +08:00
SoftFever
32d952587d use plate name in job name if set 2023-04-01 13:24:13 +08:00
SoftFever
8c06837e17 Merge pull request #610 from hliebscher/lang_de_fix
smal de fixes
2023-03-30 18:34:04 +08:00
Heiko Liebscher
46e56a90cd smal de fixes 2023-03-30 11:58:24 +02:00
Heiko Liebscher
8c1e7eeb35 first add j1 2023-03-30 09:34:23 +02:00
SoftFever
72e2a4c417 Set z hop/lift type to Normal by default 2023-03-29 23:38:49 +08:00
SoftFever
2e5c648be7 set z hop type to Normal by default 2023-03-29 23:38:08 +08:00
SoftFever
6d60f968f4 New feature: plate name 2023-03-29 22:13:42 +08:00
SoftFever
ab73f0be6d update locale 2023-03-29 22:12:33 +08:00
SoftFever
f5c4cc9a54 New feature: plate name 2023-03-29 21:36:14 +08:00
SoftFever
b243bac282 fix clang-format 2023-03-29 21:16:39 +08:00
mainmind
70c1d86069 Rebase 2023-03-25 17:50:51 +08:00
SoftFever
4126ae79dd Merge pull request #535 from veevee2/main
Update PrintConfig.cpp
2023-03-20 20:32:26 +08:00
veevee2
0ddaa092ae Update PrintConfig.cpp
#534 ; allow up to 1.8mm nozzle diameter (from 1.0 maximum originaly)
2023-03-19 17:10:06 +01:00
SoftFever
81f2bd6428 Merge pull request #529 from SoftFever/SoftFever
Soft fever
2023-03-19 18:39:33 +08:00
SoftFever
7e204959e6 trigger CICD for main branch only 2023-03-19 18:20:24 +08:00
SoftFever
01867cd319 update doxygen 2023-03-19 18:14:16 +08:00
SoftFever
3975e6c7c1 improve taskbar icon, added a white circle background and transparency. 2023-03-19 18:14:16 +08:00
SoftFever
2696a63bb2 fix regression: wrong first_layer_print_min and first_layer_print_max when project has multi plates
#523
2023-03-19 18:14:16 +08:00
SoftFever
a93be7465e Merge pull request #522 from hliebscher/fix_de
fix #497 de
2023-03-19 17:58:52 +08:00
Heiko Liebscher
d620704286 fix #497 de 2023-03-19 02:01:53 +01:00
SoftFever
a49b24fc79 Merge pull request #515 from hliebscher/fix_de
fix mm/s and raft translation
2023-03-18 23:17:23 +08:00
Heiko Liebscher
23dc4a8787 fix mm/s and raft translation 2023-03-18 12:48:46 +01:00
SoftFever
18cf281e5b Merge pull request #504 from hliebscher/fix_de
fix Bambu to Orca in windows version
2023-03-18 12:04:19 +08:00
Heiko Liebscher
ff0cc11447 fix Bambu to Orca in windows version 2023-03-17 23:02:34 +01:00
SoftFever
e35866bad6 Update FUNDING.yml 2023-03-18 00:44:37 +08:00
SoftFever
fe12f66679 Create FUNDING.yml 2023-03-18 00:41:21 +08:00
SoftFever
7cfd79bd90 Merge pull request #494 from SoftFever/feature/logo_change
1.5.0 Build
2023-03-17 22:30:57 +08:00
SoftFever
e54239fdbe update about 2023-03-17 22:25:38 +08:00
SoftFever
158e6b33fb more logo fix 2023-03-17 21:05:54 +08:00
SoftFever
ce0b393415 mac Intel pack fix 2023-03-17 19:17:46 +08:00
SoftFever
4fab4ebea0 logo change 2023-03-17 19:16:36 +08:00
SoftFever
8e05e9c71f 1.5.0_Mac_Intel_rebuilt 2023-03-17 09:10:45 +08:00
SoftFever
ff81b988a3 1.5.0 2023-03-17 00:28:39 +08:00
SoftFever
ea2430265b Update readme 2023-03-16 22:16:13 +08:00
SoftFever
dbd430f11c Merge pull request #490 from hliebscher/fix_lang
fix only language german for OrcaSlicer
2023-03-16 22:15:02 +08:00
Heiko Liebscher
70675159db fix cration Date 2023-03-16 14:57:57 +01:00
Heiko Liebscher
5b30f35812 fix only language german for OrcaSlicer 2023-03-16 14:51:19 +01:00
SoftFever
cdf7a7722a fix pot/po 2023-03-16 21:35:31 +08:00
SoftFever
a5a3262c32 clean up Mac 2023-03-16 20:50:23 +08:00
SoftFever
cc5f40fc14 Fix Mac CICD 2023-03-16 08:53:36 +08:00
SoftFever
330dfa382d quite tar 2023-03-16 08:53:36 +08:00
SoftFever
b591c0c49c Merge branch 'SoftFever' into SoftFever-SF 2023-03-16 08:53:35 +08:00
SoftFever
c2827e3161 CICD: was uploading wrong zip file 2023-03-16 01:29:29 +08:00
SoftFever
dfa5d42d84 Increase max printer height to 2 meters
#452
2023-03-16 01:13:09 +08:00
SoftFever
7e03210181 update locale 2023-03-16 00:12:17 +08:00
SoftFever
3570b93d65 sign mac app 2023-03-15 23:51:42 +08:00
SoftFever
25f2dd6ebb Merge branch 'bs_1.5.0.61' into SoftFever 2023-03-15 22:29:41 +08:00
SoftFever
006f1f4e5a update readme 2023-03-15 00:18:06 +08:00
SoftFever
2f994207b1 fix linux build 2023-03-15 00:00:13 +08:00
SoftFever
2895477da4 tweak generator info and use local time stamp for better readability 2023-03-14 22:12:33 +08:00
SoftFever
f914a36a7f Fixed an issue that M204 was not properly generated when verbose gcode is off for klipper
#480
2023-03-14 21:35:20 +08:00
SoftFever
06d81098f3 support different URL for web ui
#451
2023-03-14 21:33:19 +08:00
SoftFever
da57260101 change default slow_down_min_speed to 10 2023-03-14 21:30:45 +08:00
SoftFever
02b3cd119a add show_gcode_window preference 2023-03-14 21:29:58 +08:00
gerrit
d54bb63460 ci: update build version to 01.05.00.61
Change-Id: I828de8c355151260da339acc75793f1d10f63ccf
2023-03-14 20:52:40 +08:00
Stone Li
db20e5efed FIX: fix third-party login
Change-Id: Ib4699ecec1a6c72a9bc4967751d07b75f6b52d3a
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-03-14 20:52:14 +08:00
SoftFever
5a986c18a1 First layer travel speed
#443
2023-03-14 00:58:02 +08:00
SoftFever
6d8f01f48d fix sandwich inner-outer-inner regression
$468
2023-03-14 00:58:02 +08:00
SoftFever
ee72ebb988 handle missing conf file case 2023-03-13 10:37:03 +08:00
SoftFever
2b38153395 fix invalid characters in gcode 2023-03-12 23:38:46 +08:00
SoftFever
11c1c17245 Added brim width setting for tree support 2023-03-12 21:05:59 +08:00
SoftFever
a47c756112 Added gcode_label_objects and gcode_comments option 2023-03-12 18:25:42 +08:00
SoftFever
11679d6858 fix loading project issue 2023-03-12 12:11:43 +08:00
SoftFever
996af2b0b6 Update README.md 2023-03-12 11:22:43 +08:00
SoftFever
5953f24361 update CI/CD 2023-03-12 11:14:56 +08:00
SoftFever
04b05bff7a update Readme 2023-03-12 11:08:56 +08:00
SoftFever
5b0ba1207e Change Application name to OrcaSlicer 2023-03-12 10:05:22 +08:00
SoftFever
81ca7720e9 change BambuStudio to OrcaSlicer 2023-03-10 19:26:01 +08:00
SoftFever
20f2b2cd0e OrcaSlicer 2023-03-10 18:58:43 +08:00
SoftFever
3a80173533 rename bambu-studio to orca-slicer 2023-03-10 18:53:25 +08:00
SoftFever
da61839e84 Merge remote-tracking branch 'upstream/v1.5.0' into SoftFever 2023-03-10 18:46:46 +08:00
SoftFever
c5abc98f11 minor changes 2023-03-10 18:35:57 +08:00
Lane.Wei
40684c561e Merge branch 'master' into v1.5.0 2023-03-09 20:21:51 +08:00
salt.wei
ac4b35def8 ENH: force to use . as decimal point
"std::cout << float number" is unsafe which
may use , as decimal point when switch language.

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I8a379117168eab0111dc93987b1d6130a741ade6
2023-03-09 19:07:29 +08:00
qing.zhang
67daabaddc ENH: modify temperature_temp of PET-CF
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I2e361b79620cbc5e7df7d5a657f8b26e285d3538
2023-03-09 19:07:29 +08:00
qing.zhang
fa1d8953ad ENH: add Bambu PET-CF & modify slow down layer time of Bambu PLA-CF
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I8396840eca762def30cb794f4c29808f2f71adfa
2023-03-09 19:07:29 +08:00
lane.wei
a91c4f37fc ENH: Linux: set BBL_INTERNAL_TESTING to 1 for release build
Change-Id: I1545636c9e9714b44124ea0ddf18ef39f277a2b8
2023-03-09 19:07:29 +08:00
gerrit
7f9dc48560 ci: update build version to 01.05.00.60
Change-Id: I326a6f48e8bffbdb961fb02578497250d2339bf6
2023-03-09 19:07:29 +08:00
qing.zhang
df157d3682 ENH: add Bambu PETG-CF & change filament id of PLA Silk
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: Ib62b479a2a6648a2a4bfa0d3deb11f6f37f754a4
2023-03-09 19:07:28 +08:00
chunmao.guo
7b85495c28 FIX: [] not unload user presets on app closing
Change-Id: I517366d0cddab9c073db7bf70fec8f59d7d39e3c
2023-03-09 19:07:28 +08:00
SoftFever
49d42c52b9 Update build_win.yml 2023-03-09 01:19:59 +08:00
SoftFever
3470460931 fix colors 2023-03-09 01:05:51 +08:00
SoftFever
7a53dd60f2 fix build error 2023-03-09 01:05:22 +08:00
SoftFever
013e77aa6b Merge pull request #447 from SoftFever/feature/1.5
Feature/1.5
2023-03-08 20:47:31 +08:00
SoftFever
50793bb1fc change color 2023-03-08 20:08:54 +08:00
SoftFever
0148efa287 remove dup opt 2023-03-08 19:51:54 +08:00
SoftFever
5ef51f6c8a Merge branch 'master-remote' into feature/1.5
Signed-off-by: SoftFever <softfeverever@gmail.com>

# Conflicts:
#	bbl/i18n/BambuStudio.pot
#	bbl/i18n/de/BambuStudio_de.po
#	bbl/i18n/en/BambuStudio_en.po
#	bbl/i18n/es/BambuStudio_es.po
#	bbl/i18n/fr/BambuStudio_fr.po
#	bbl/i18n/hu/BambuStudio_hu.po
#	bbl/i18n/it/BambuStudio_it.po
#	bbl/i18n/nl/BambuStudio_nl.po
#	bbl/i18n/sv/BambuStudio_sv.po
#	bbl/i18n/zh_cn/BambuStudio_zh_CN.po
#	deps/Boost/Boost.cmake
#	deps/wxWidgets/wxWidgets.cmake
#	resources/config.json
#	resources/i18n/de/BambuStudio.mo
#	resources/i18n/en/BambuStudio.mo
#	resources/i18n/es/BambuStudio.mo
#	resources/i18n/fr/BambuStudio.mo
#	resources/i18n/hu/BambuStudio.mo
#	resources/i18n/it/BambuStudio.mo
#	resources/i18n/nl/BambuStudio.mo
#	resources/i18n/sv/BambuStudio.mo
#	resources/i18n/zh_cn/BambuStudio.mo
#	resources/images/tips_arrow.svg
#	resources/profiles/Anycubic.json
#	resources/profiles/Anycubic/filament/Anycubic Generic ABS.json
#	resources/profiles/Anycubic/filament/Anycubic Generic ASA.json
#	resources/profiles/Anycubic/filament/Anycubic Generic PA-CF.json
#	resources/profiles/Anycubic/filament/Anycubic Generic PA.json
#	resources/profiles/Anycubic/filament/Anycubic Generic PC.json
#	resources/profiles/Anycubic/filament/Anycubic Generic PETG.json
#	resources/profiles/Anycubic/filament/Anycubic Generic PLA-CF.json
#	resources/profiles/Anycubic/filament/Anycubic Generic PLA.json
#	resources/profiles/Anycubic/filament/Anycubic Generic PVA.json
#	resources/profiles/Anycubic/filament/Anycubic Generic TPU.json
#	resources/profiles/Anycubic/filament/fdm_filament_common.json
#	resources/profiles/Anycubic/machine/Anycubic 4Max Pro 0.4 nozzle.json
#	resources/profiles/Anycubic/machine/Anycubic 4Max Pro.json
#	resources/profiles/Anycubic/process/0.20mm Standard @4MaxPro.json
#	resources/profiles/Anycubic/process/fdm_process_common.json
#	resources/profiles/BBL.json
#	resources/profiles/BBL/machine/Bambu Lab P1P 0.2 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab P1P 0.4 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab P1P 0.6 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab P1P 0.8 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab X1 0.2 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab X1 0.4 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab X1 0.6 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab X1 0.8 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab X1 Carbon 0.2 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab X1 Carbon 0.4 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab X1 Carbon 0.6 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab X1 Carbon 0.8 nozzle.json
#	resources/profiles/BBL/machine/fdm_bbl_3dp_001_common.json
#	resources/profiles/Voron.json
#	resources/web/data/text.js
#	resources/web/image/printer/Anycubic 4Max Pro_cover.png
#	src/BambuStudio.cpp
#	src/libslic3r/GCode.cpp
#	src/libslic3r/GCode.hpp
#	src/libslic3r/GCode/GCodeProcessor.cpp
#	src/libslic3r/GCodeWriter.hpp
#	src/libslic3r/PerimeterGenerator.cpp
#	src/libslic3r/PresetBundle.cpp
#	src/libslic3r/Print.cpp
#	src/libslic3r/Print.hpp
#	src/libslic3r/PrintConfig.cpp
#	src/libslic3r/PrintConfig.hpp
#	src/libslic3r/PrintObject.cpp
#	src/slic3r/GUI/AMSMaterialsSetting.cpp
#	src/slic3r/GUI/AMSMaterialsSetting.hpp
#	src/slic3r/GUI/AmsMappingPopup.cpp
#	src/slic3r/GUI/AmsMappingPopup.hpp
#	src/slic3r/GUI/Auxiliary.cpp
#	src/slic3r/GUI/BackgroundSlicingProcess.cpp
#	src/slic3r/GUI/ConfigManipulation.cpp
#	src/slic3r/GUI/DeviceManager.cpp
#	src/slic3r/GUI/DeviceManager.hpp
#	src/slic3r/GUI/ExtrusionCalibration.cpp
#	src/slic3r/GUI/GCodeViewer.cpp
#	src/slic3r/GUI/GCodeViewer.hpp
#	src/slic3r/GUI/GUI_App.cpp
#	src/slic3r/GUI/IMSlider.cpp
#	src/slic3r/GUI/Jobs/PrintJob.cpp
#	src/slic3r/GUI/Jobs/PrintJob.hpp
#	src/slic3r/GUI/Jobs/SendJob.cpp
#	src/slic3r/GUI/Jobs/SendJob.hpp
#	src/slic3r/GUI/MainFrame.cpp
#	src/slic3r/GUI/MainFrame.hpp
#	src/slic3r/GUI/MediaPlayCtrl.cpp
#	src/slic3r/GUI/OptionsGroup.cpp
#	src/slic3r/GUI/PhysicalPrinterDialog.cpp
#	src/slic3r/GUI/Plater.cpp
#	src/slic3r/GUI/PrintHostDialogs.cpp
#	src/slic3r/GUI/Printer/BambuTunnel.h
#	src/slic3r/GUI/Printer/PrinterFileSystem.cpp
#	src/slic3r/GUI/Printer/gstbambusrc.c
#	src/slic3r/GUI/Printer/gstbambusrc.h
#	src/slic3r/GUI/ReleaseNote.cpp
#	src/slic3r/GUI/ReleaseNote.hpp
#	src/slic3r/GUI/SelectMachine.cpp
#	src/slic3r/GUI/SendToPrinter.cpp
#	src/slic3r/GUI/SetBedTypeDialog.cpp
#	src/slic3r/GUI/StatusPanel.cpp
#	src/slic3r/GUI/StatusPanel.hpp
#	src/slic3r/GUI/Tab.cpp
#	src/slic3r/GUI/Widgets/AMSControl.cpp
#	src/slic3r/GUI/Widgets/AMSControl.hpp
#	src/slic3r/GUI/Widgets/ImageSwitchButton.cpp
#	src/slic3r/GUI/Widgets/Label.cpp
#	src/slic3r/GUI/WipeTowerDialog.cpp
#	src/slic3r/Utils/Process.cpp
#	src/slic3r/Utils/bambu_networking.hpp
#	version.inc
2023-03-08 00:08:26 +08:00
SoftFever
939b43a09e modify gitignore
Signed-off-by: SoftFever <softfeverever@gmail.com>
2023-03-07 19:49:58 +08:00
SoftFever
a6cd32fe72 Allow user to turn adaptive layer height for tree support.
Signed-off-by: SoftFever <softfeverever@gmail.com>
#257
2023-03-06 19:57:09 +08:00
SoftFever
6ed219fb65 enable support angle
Signed-off-by: SoftFever <softfeverever@gmail.com>
#401
2023-03-05 17:43:10 +08:00
SoftFever
5c055d65c9 tweak PA tower setting for Arachne
Signed-off-by: SoftFever <softfeverever@gmail.com>
#353
#397
2023-03-05 17:34:31 +08:00
SoftFever
c58ed92da1 Support filament shrinkage
Ported from SuperSlicer

Signed-off-by: SoftFever <softfeverever@gmail.com>
#360
2023-03-05 17:23:17 +08:00
SoftFever
23189c8726 fix wrong dll path
(cherry picked from commit 7aa20a47843a3e747c484afb27d37ad57f08c1fb)
2023-03-05 01:45:34 +08:00
SoftFever
2131c658d8 Tab shortcut key to switch between prepare/preview tab
#383

(cherry picked from commit 93f3d8b0cecaa13fa3f3ab5fc483cfb8ac4852c4)
2023-03-05 01:45:20 +08:00
Jason M-H
d535d70d03 Add sparse / internal solid infill accel controls (#382)
* Add sparse / internal solid infill accel controls

* infill accel control as %

* update tooltip

* update to abs value
2023-03-04 17:52:46 +08:00
Jordan Hubbard
3a670040c7 Make this work with either brew or macports and emit diagnostic when (#419)
neither is found rather than just blowing up.
2023-03-04 15:07:01 +08:00
SoftFever
771ef9fd80 support datadir parameter
#325
2023-03-04 15:05:38 +08:00
Cal Heldenbrand
0d6778a9d4 Add privleged mode...
The popover window to select printers acts strange and fuzzes
out.  I see errors trying to access the raw video card device
using libGL, and other errors with dbus access.  Turning on
privileged mode fixes this.
2023-03-02 21:21:30 +08:00
Cal Heldenbrand
a664128714 Add DockerBuild.sh and DockerRun.sh helper scripts 2023-03-02 21:21:30 +08:00
Cal Heldenbrand
36e2179adc Added some build process to Dockerfile 2023-03-02 21:21:30 +08:00
Cal Heldenbrand
4933f9089c Add some dockery things to ignore 2023-03-02 21:21:30 +08:00
Cal Heldenbrand
6916f49e98 Copy .gitignore to .dockerignore 2023-03-02 21:21:30 +08:00
Cal Heldenbrand
b8bbbf3cbc Remove comments, alpha-sort package names for easier maintenance 2023-03-02 21:21:30 +08:00
Cal Heldenbrand
a64085f165 Copy Containerfile to Dockerfile before modifying 2023-03-02 21:21:30 +08:00
gerrit
69573c9b01 ci: update build version to 01.05.00.59
Change-Id: I2f74a48b30833d295fee2a3383e7d46ce9c08720
2023-03-01 15:58:50 +08:00
tao wang
9420de5931 FIX:fixed Lan mode printer will disconnection after connection
Change-Id: Ifa81f35f4d4f58626fc74f9d092a8a1b4d10fb0d
2023-03-01 15:58:50 +08:00
gerrit
e6acccc5d4 ci: update build version to 01.05.00.59
Change-Id: I2f74a48b30833d295fee2a3383e7d46ce9c08720
2023-03-01 15:20:45 +08:00
tao wang
17b8c67f99 FIX:fixed Lan mode printer will disconnection after connection
Change-Id: Ifa81f35f4d4f58626fc74f9d092a8a1b4d10fb0d
2023-03-01 15:20:45 +08:00
qing.zhang
65e03a5b29 FIX: fix add PETG-CF
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I47f93ac19e0c82f0c218a01f4d916b8d76331ad9
2023-02-28 18:44:28 +08:00
gerrit
682e3ef9e8 ci: update build version to 01.05.00.58
Change-Id: I2b88abdb6c599de32ad2e2cf12243c75bf7419e6
2023-02-28 18:44:28 +08:00
lane.wei
e20adc16dc FIX: fix the bed shape not correct issue when loading old 3mf
Change-Id: I924c47ea4a1f21b5e9854abdcedfe8b689ddcb67
2023-02-28 18:44:28 +08:00
qing.zhang
d484b5e5fb ENH: add PETG-CF
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: Iaee30ced3be002120b6138be31a7b57422cf20bc
2023-02-28 18:44:28 +08:00
salt.wei
538c607842 ENH: z_hop_types is enum not string
Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: Ia05eff8c78c65e358c8df36ea8b606a9b8da2663
2023-02-28 18:44:28 +08:00
tao wang
cee236e1aa FIX:fixed that the load/unload text is not translated
Change-Id: I99a4212568b056a212a0874622e5e2f4f2a581b7
2023-02-28 18:44:28 +08:00
Stone Li
4da6149845 FIX: disconnect printer when reselect same printer
Change-Id: If47a3cfa2409f77dc583922fdb416f93d295f03f
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-28 18:44:28 +08:00
tao wang
262578dd23 FIX:fixed material name is not displayed on linux
Change-Id: Idded193a00ce25b9122913c781bf228c8fbd4665
2023-02-28 18:44:28 +08:00
yifan.wu
3e2fea33a9 ENH: update upward compatible machines
P1P, X1 and X1C may compatible with each other

Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: I1de7350cbc613e0dc539fe2e7f26dbe9d455e4f3
2023-02-28 18:44:28 +08:00
liz.li
1d94e0c021 FIX: remove text translate of all plates stats button
Change-Id: If19e522051cb81f69c37b1fb37d4db2b516ccdc9
2023-02-28 18:44:28 +08:00
gerrit
0e2124e3e2 ci: update build version to 01.05.00.57
Change-Id: Ib92fbe4429bb49ec89babe3ee8a78a77fc6abeb3
2023-02-28 18:44:28 +08:00
tao wang
46289a7cf1 FIX:optimize the status detection of the virtual tray
Change-Id: I7d39d8a6789bc13506a8d1ec0a0abe9bd5ae6f4a
2023-02-28 18:44:28 +08:00
salt.wei
e094af7040 ENH: add PETG-CF type
Add new filament type before new filament preset.

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I404880668a3cec566e0b35e38a6b467936f50bb7
2023-02-28 18:44:28 +08:00
zhimin.zeng
536ae58a4a FIX: Assemble matrix error when adding text
Change-Id: I676a3534ccb725516457c0700368c7f57c9bb6d1
2023-02-28 18:44:28 +08:00
zhimin.zeng
93ad247eff FIX: text spaces is not work
the mesh of space is null, so the width of space is 0.
we use 'i' instead of space to calculate width.

Change-Id: I95d92d96e19416406d644ca35f0f14ade870f315
2023-02-28 18:44:28 +08:00
SoftFever
29600dd67e attempt to fix black texture for Voron machines on some old computers 2023-02-27 21:06:23 +08:00
SoftFever
7d094a6f5e Update build_linux.yml 2023-02-26 14:14:23 +08:00
Heiko Liebscher
071cb32923 fix icon.icns for mac (#374) 2023-02-26 13:56:38 +08:00
SoftFever
d6f92560c8 Update issue templates 2023-02-26 12:23:52 +08:00
SoftFever
ae6c5be6e9 one wall top/bottom for Arachne
#340
#350
2023-02-26 12:07:40 +08:00
SoftFever
113f3d4c26 cicd: only build for main branch 2023-02-25 19:33:55 +08:00
SoftFever
463393c969 fix non-manifold issue for temp tower
#368
2023-02-25 19:23:41 +08:00
SoftFever
8a3f5f604e flowrate test: decrease sparse infill density to 35% 2023-02-25 19:23:40 +08:00
lane.wei
a2f88ac9d5 ENH: deps: add a flag to select jpeg lib's version under linux
by default use libjpeg.so.8

Change-Id: I2602820e7ef901badc7e27b6108b02eaf3597ffe
2023-02-24 17:44:15 +08:00
chunmao.guo
60dbf71cd6 FIX: [STUDIO-2331] gtk resize popup window
Change-Id: I3ad2c26c5c1fcc94964fa838ce2596b727712195
2023-02-24 17:44:15 +08:00
lane.wei
5806263731 FIX: cli: fix a crash caused by log
Change-Id: I3dad5a47241ff57818e68fda58d7f70f497bf5e1
2023-02-24 17:44:15 +08:00
tao.jin
39f87ca39e ENH: change sdcard icon
Change-Id: I9f52213395672b591f9a4928071503d1817eaa85
2023-02-24 17:44:15 +08:00
Stone Li
a985c21f3a ENH: sync po files with localazy
Change-Id: Ifd5414a6bdb8fa1dfb55b01f7e3f85d6562b3fc1
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-24 17:44:15 +08:00
zhimin.zeng
a1cd25cd21 FIX: fix possible crash for text
Change-Id: I57670a55f3e55fd0ded522b501a28899070e802e
2023-02-24 17:44:15 +08:00
qing.zhang
6a391de290 FIX: speed 0 on macOS 13.2 STUDIO-2265
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: Ia8d92f6a0f7d84c1216d9403793e5fa7671ee8de
2023-02-24 17:44:15 +08:00
tao.jin
d61986028d ENH: add timestamp for print error
Change-Id: If275a3148552183e75cc656c8478b8fd4ad64075
2023-02-24 17:44:15 +08:00
chunmao.guo
09f14f0ffc FIX: [STUDIO-2322] update ui after reload user settings
Change-Id: I172b9ca99fa1edc6f913e29c4a612ebe95a58de8
2023-02-24 17:44:15 +08:00
tao wang
9e7e41e5f8 FIX:fixed wrong display error when filament loading
Change-Id: I41ebf3a04f7c8992a2577a5cd405553e7c0a1618
2023-02-24 17:44:15 +08:00
tao wang
268dc00ee3 FIX:fixed opening amsmapping popup will crash on linux
Change-Id: If67668582656fbb8ec52b49c36eccf1805d82b2e
2023-02-24 17:44:15 +08:00
gerrit
32edd479df ci: update build version to 01.05.00.56
Change-Id: I5cb6ea659ad270d895c1d53682261eb49687a0ec
2023-02-24 17:44:15 +08:00
tao.jin
394391fd12 FIX: chinese translation (STUDIO-2311~13)
Change-Id: I341bae62a88cb6130a2558cbea4083abc360d444
2023-02-24 17:44:15 +08:00
tao wang
14c5215b48 ENH:optimize the logic related to the virtual tray
Change-Id: I4d3b78f86191a4f3760d16234006b3aa603dd09e
2023-02-24 17:44:15 +08:00
Stone Li
c63326b721 ENH: user's filemanet preset can be selected in extrusion cali
Change-Id: Ibb8961619afc835a415973f9110354a12e4272d0
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-24 17:44:15 +08:00
chunmao.guo
a48451df35 FIX: load_ams_list for initial select machine
Change-Id: I87ffa52ffb207b850156866f03bb54eb9852ee42
2023-02-24 17:44:15 +08:00
zhimin.zeng
bbc211d983 FIX: text bug fix
1. text cannot modify after changing type
2. do not allow to drag object in text gizmo

Change-Id: Ia9bbdacbce8215315cf68c768c6d9d91c1ff948c
(cherry picked from commit 897013b2a0c214fc36090cb5cf57e0c3f59f3338)
2023-02-24 17:44:15 +08:00
tao wang
0f8672eb99 FIX:use default download dir when the download path does not exist
Change-Id: Ie1a341caa9803b8cd121fac4fe20c0f3d6fcf3fa
2023-02-24 17:44:15 +08:00
chunmao.guo
06daf3bc45 FIX: [STUDIO-2323] force colors the same number as filaments
Change-Id: Ib57fccc0961cb680502aad6ef039c637cffe0f6b
2023-02-24 17:44:15 +08:00
gerrit
5cdd515a9b ci: update network module based on commit 7007e94
Change-Id: I88629b9e03aa275ed226a4ddba5082132d51d6d3
(cherry picked from commit 2a0512489a96524c4c9e44675e44edcd510e9f36)
2023-02-24 17:44:15 +08:00
chunmao.guo
25bcd9a517 FIX: update compatible after remove user presets
Change-Id: Ib989501429d4faf767bd59ea13a458b2367998ef
2023-02-24 17:44:15 +08:00
tao wang
eefe65321f FIX:fixed fan control will close after operation
Change-Id: Ic512dd7838bc843dc71f4bc75bdf719443b98124
2023-02-24 17:44:15 +08:00
zhimin.zeng
0846c6b9fe FIX: re-slice when modify "top_shell_layers"
STUDIO-2293 re-slice when change top_shell_layers form 0 to other, or from other to 0.

Change-Id: I57545b9d84a618e9a37a8169111916af3e524898
2023-02-24 17:44:15 +08:00
salt.wei
354a3736e4 ENH: use spiral lift as default lift type
Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I52477adc3e6d48ab8201364c74006c5432db5d67
2023-02-24 17:44:15 +08:00
gerrit
e0895211e4 ci: update build version to 01.05.00.55
Change-Id: Idbc19650d4c471528ebfba8c5954a184aee8ba03
2023-02-24 17:44:15 +08:00
tao wang
ea37a10951 FIX:Gcode feed/back not supported
Change-Id: I50956060e35d95ff610b2f95764c6e97468c53bb
2023-02-24 09:23:57 +08:00
tao wang
b4e49bdc17 ENH:optimizing tips of virtual tray
Change-Id: If688bd2e28036380aa73e01491aa370f4d9523a4
2023-02-24 09:23:57 +08:00
wintergua
d5f2a3e748 ENH: translate of the tooltips of brim type
Change-Id: I37601cbe4b116c79bdd164feac12d463d4b1c5ce
2023-02-24 09:23:57 +08:00
wintergua
4abaad0244 FIX: typos in the tooltip of brim tpye
The tooltip of brim type contain messages of inner brim,
which is not enabled in the current version

Change-Id: I155a16cc4331cb0b5b54d29f6be1de6c82819e0c
(cherry picked from commit 1fe773438e1697b8a0b9817a885b13e7e4fae097)
2023-02-24 09:23:57 +08:00
gerrit
fa5b5d28da ci: update build version to 01.05.00.54
Change-Id: I510b9980893414d5218aa7edf73153633dbdb604
2023-02-24 09:23:57 +08:00
Arthur
2616479489 FIX: fix possible toolhead shake by adding 300ms delay
1. It seems there are a lot of buffered frames in IP CAM. Have to
   wait enough time untill all buffers are flushed.
2. From watermellon's suggestion, increase travel speed duing layer
   change, to save time and reduce oozing.

JIRA: STUDIO-2167
Change-Id: Ia2ec0bde216e90207897c00c395f7e02ea2fe342
(cherry picked from commit 9c85a7c68617b1628e1698912da20f1ebc69ec16)
2023-02-24 09:23:57 +08:00
zhimin.zeng
2fe0930777 FIX: Modify translation
Change-Id: I5c29e805dd8b93fbc3d8a59ef146e2fd16ce9ea0
2023-02-24 09:23:57 +08:00
liz.li
6f8557861b ENH:replace a svg
Change-Id: I6a5f13bf45d959a14f39bebbded425be8ab52d35
2023-02-24 09:23:57 +08:00
Stone Li
edd5e9cbb2 ENH: display release note if description is empty
Change-Id: Ia13b14e8e43f5c9d289fe6992bf3685b05017fbb
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-24 09:23:57 +08:00
tao.jin
684ff8047a FIX: avoid repeated login handle
Change-Id: Id18270a130299e6cd091cec4a05549cd4416b736
2023-02-24 09:23:57 +08:00
tao.jin
72e06cbd8b FIX: remove export G-code link after slicing
Change-Id: I42d9c81ea06ec3f3f4d19776d11b998252307cc6
2023-02-24 09:23:57 +08:00
zhimin.zeng
3e3728f0a7 FIX: add a warning for XY size compensation with multi-color
Change-Id: I11000600f49fc1b0a8869d09a69fb37167ded22a
2023-02-24 09:23:57 +08:00
zhimin.zeng
6365c95db3 FIX: text position is incorrect
1. modify text alignment.
2. modify the text attachment position error caused by the precision.

Change-Id: Ie85da70341719932f7aa165243a95427bac19c3f
2023-02-24 09:23:57 +08:00
zhimin.zeng
f144cd31b8 FIX: position is incorrect when reloading disk
STUDIO-2224

Change-Id: I179de7cde8edffbe686a1eff41d0e2271dcca65e
2023-02-24 09:23:57 +08:00
salt.wei
14ca73ec3c ENH: miss generic PLA silk for P1P
As title

Handle for github issue #1303

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: Iffda4f3ea615a4e876f83ef8f85dacf954d5678e
2023-02-24 09:23:57 +08:00
Stone Li
4a580d37df ENH: send print job through cloud only for P1P
Change-Id: Id89a0a60be91f415eb6d586ac11f70849c9cb01f
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-24 09:23:57 +08:00
liz.li
98b5e60c25 FIX:text above assemble view doesn't align center
Change-Id: I46b3993416634f6dab1ae9de77199bb19e52e6ad
2023-02-24 09:23:57 +08:00
liz.li
3be3c5553e ENH:add some translations
Change-Id: Iec4b31ada7d1f21f7ddb12fd777fd284298a0cde
2023-02-24 09:23:57 +08:00
tao wang
875c851b61 ENH:optimize the detection of FTP connection status
Change-Id: I9e7095959f3933e5fa22a0b274d221b1c2c42878
2023-02-24 09:23:57 +08:00
tao wang
9b59fb4cbc FIX:FIXED AMSapping popip window will display all ams
Change-Id: I98fae37cca90f7348d026e91e1b785af958f2f46
2023-02-24 09:23:57 +08:00
liz.li
c09fca6e60 FIX:cannot load .gcode file
Change-Id: I14d42d8fb4b6370ac01c8e5325b561520fa94072
2023-02-24 09:23:57 +08:00
liz.li
ae0ad4136b FIX:(mac)preview display
preview GCodeViewer Legend display doesn't disable when changing printer setting

Change-Id: I97a1b9a1002a6327c31721f9b695a2fe2fe0dbf6
2023-02-24 09:23:57 +08:00
liz.li
40a6fb2fe8 ENH:preview slider forbidden adding color-change when open spiral vase
Change-Id: I99cf950c301a0b4f455b039972f144d8f14880f8
2023-02-24 09:23:57 +08:00
SoftFever
64f0c96283 New feature: bring back gcode window as well as optimized the show/hide logic a bit 2023-02-24 00:25:02 +08:00
5axes
6191b4b6dd Update French Translation (#337)
* Update BambuStudio_fr.po

French translation

* Update BambuStudio_fr.po

New modifications

* Update BambuStudio_fr.po

Test to add Layer time ( missing in the original po file)

* Update French

Change some French initial translation like A-coup in Saccade

* Update BambuStudio_fr.po

Add Jerk(XY)

* Update BambuStudio_fr.po

last modification for today

* Update BambuStudio_fr.po

Last French translation of the Morning
Mainly on the Giszmo

* Update BambuStudio_fr.po

Mainly on Filament parameter

* Update BambuStudio_fr.po

Adjust translation with :

https://github.com/BastR/BambuStudio/blob/french-trad/bbl/i18n/fr/BambuStudio_fr.po

* Update BambuStudio.mo

* last modif

Last modif for today

* Update fr

an other one

* Update

Last Modification

* Update

Missing term in the German translation

* update

Changement

* update

TimeLaps

* Update 11/1/2023

Minor Change
Update  : Year / Month ( not translated in the previous translation)

* Update French Translation

Update for BambuStudio-SoftFever_V1.4.2

* Change some typro

Update some Typo

* Fix some Typo

Fix somme Typo and Label not presnet in the pot file

* Add Calibration SoftFever

Add missing Label on the SoftFever Calibration Menu

* Update BambuStudio_fr.po

Erreur Taper: -> Type:

* Update text.js

Add French Translation for Web interface

* Add Manual Web text

Translate French Manual Web text

* Update text.js

Back to "en"
2023-02-22 23:07:05 +08:00
gswatkins
9a117afbe3 Cleanup DOWNLOAD_EXTRACT_TIMESTAMP warning for CMake 3.24 (#327)
CMake 3.24 introduces a new policy for managing timestamps on extracted contents
of downloaded archives. This change specifies the new behavior should be used
for dependencies to eliminate the warning printed when the policy is not set.
2023-02-22 22:39:20 +08:00
gerrit
971c7f358e ci: update build version to 01.05.00.53
Change-Id: I38187578d7531282d800deb75b6794a2d5882b1c
2023-02-22 20:09:17 +08:00
Stone Li
50462d14eb ENH: enlarge thumbnail size of plate to 512*512
Change-Id: I076060a8b315e3bda88d972cbf3cd05f42399c78
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-22 20:09:17 +08:00
Stone Li
29b03d5e53 FIX: disconnect lan mode printer when switch another printer
Change-Id: I6480c5c24d97c5e25eaa0878732590e6c1412bdd
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-22 20:09:17 +08:00
Stone Li
a48c36fde1 ENH: refine load/unload for spool holder filament
update ams load/unload gcode

Change-Id: Ia3d4a26efb14325c89f0c9f9571268c1834361ae
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-22 20:09:17 +08:00
gerrit
9480b84b64 ci: update build version to 01.05.00.52
Change-Id: Iceceb0507577efdb709a1099615680a971575d33
2023-02-22 20:09:17 +08:00
tao.jin
e422797292 ENH: create new page on click of privacy policy
Change-Id: I20026514c1e880986f24716c9f473507f608cd67
2023-02-22 20:09:17 +08:00
zhimin.zeng
1b3ac0a0b6 FIX: modify the control layout
Change-Id: Icabb5484dc202b684ecefabddcf3594a0c632387
2023-02-22 20:09:17 +08:00
tao.jin
c1cc270788 ENH: chinese translation
Change-Id: I6c072b36a14fed516a9cdcbd7c7ea2038ec29f3f
2023-02-22 20:09:17 +08:00
Arthur
a981d3ac2c ENH: reduce possible toolhead shake in smooth timelapse
It's not necessary to pause before photo-shooting, but after it.
Pausng by 50ms should be enough.

Jira: STUDIO-2167

Change-Id: I88ba5db1d6cce390ae5e26ac03533b0ee277b5bd
(cherry picked from commit ae34c0b9e875d1e52798a5359b0cce2151942fb8)
2023-02-22 20:09:17 +08:00
liz.li
72c80aaad8 FIX: assemble hide cannot work in multi-color case
Change-Id: Icde1812012bbd436efb2a60c29870627b9cfff71
2023-02-22 20:09:17 +08:00
zhimin.zeng
e03f4ff67e FIX: enhance the path when change filament
If the three points are in a straight line, let the middle point coincide with the first point.

Change-Id: I32e5a1e1f5f217f9db9766d698590e758f334ca1
(cherry picked from commit d8771943bddf80e23dab5e9fa841acb7e24e873d)
2023-02-22 20:09:17 +08:00
lane.wei
6f8f937aa6 ENH: translation: add some translation
Change-Id: I3d7e9d791a3b9425f1addaca65a8ef9181616b13
2023-02-22 20:09:17 +08:00
zhimin.zeng
c7ec112420 ENH: optimize text interaction
Change-Id: I1d132124816ba0946fd4d05310f8cd6da17a7e45
(cherry picked from commit f741a33a3651e266edfd4c191322f8988a3666f2)
2023-02-22 20:09:17 +08:00
zhimin.zeng
1041b8b026 NEW: Support attaching 3D text to a surface
Change-Id: I13f234cf5f189b594a6277d623dfa9dee489d19f
(cherry picked from commit 88ec90226aecb8203c105569a613d33c68a0602b)
2023-02-22 20:09:17 +08:00
Stone Li
85bcb8eae8 ENH: sync po files with localazy
Change-Id: Id2637ab8c80e1cc557ded245b612d6692ff6d31f
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-22 20:09:17 +08:00
liz.li
9a18e4e54b FIX: preview model display problem after tick changed
Change-Id: I1d17fe1b19d323642ad2aff0329c919a627dc3fc
2023-02-22 20:09:17 +08:00
liz.li
0576e3e4fd FIX: all plates stats crash
Change-Id: Iad42b9777e4f3fab4a432b73865d4bd7dd530fd3
2023-02-22 20:09:17 +08:00
tao.jin
2fc699be6a ENH: change video icons
Change-Id: Ib8baf01eae1edae4f30872e4d8d6e06dc817fba1
2023-02-22 20:09:17 +08:00
qing.zhang
350adb6176 FIX: revert "FIX: fix adjust of cooling time"
This reverts commit 9e026a289542545d5f63cd72fb9416be1521ecc2.

This Revert "ENH: STUDIO-2221 adjust cooling time for each layer"

This reverts commit eb1fa5975eb7dc3ff832539e9bec5a04515ff2f9.

Change-Id: Iba8d0a1492b81922aad0d64df81c74cff5eabbb3
2023-02-22 20:09:17 +08:00
tao wang
2c1a123d91 ENH:optimize the switching effect of dark mode
Change-Id: I51175dc5bdeff83442d46d4fa34511916f90b878
2023-02-22 20:09:17 +08:00
tao wang
11a12e8351 FIX:restore the function of the unload button
Change-Id: Ia60bf73f12a7e60b55ef2814a3783a9ca87ca9a0
2023-02-22 20:09:17 +08:00
tao wang
a246e003da ENH:optimize dark mode
Change-Id: I97d6f1483436d608959ca8ab0acb1191aaebf71d
2023-02-22 20:09:17 +08:00
tao wang
94e097cd05 FIX:optimize the size of amsmapping item
Change-Id: I791d897c327b51991b203a58fab957cbe74b1b44
2023-02-22 20:09:17 +08:00
chunmao.guo
fba36c6a41 FIX: not play p1p's livelive when upgrading
Change-Id: Ibc52b1ec0bc40fda8adf6d049c0dcdffebb8dbd0
2023-02-22 20:09:17 +08:00
tao.jin
f5e8d70989 FIX: cancel loading .step without warning
Change-Id: I5274b744c223fbd92dbca669f3d57c01b5558f88
2023-02-22 20:09:17 +08:00
MusangKing
1d92895456 FIX: withdraw support enforcers on vertical faces
JIRA: studio-2274

Now support enforcer on vertical faces function is invalid. Previous
enhancement of support enforcer on vertical faces brounght more conficts
than benefits.

Change-Id: Icbb0df3995d8ac8b3c22dda1bd4615da78af963b
(cherry picked from commit bca003cbc35791838484afe4032276be8fa91db0)
2023-02-22 20:09:17 +08:00
lane.wei
0a730e9c2e FIX: return true instead of false to represent success
Change-Id: Ib4bf8b5f5db50cfa98d578dad763174ec6d8ad4d
(cherry picked from commit bd7890c32e9bee9cc2316f11c5964a592d58c2d2)
2023-02-22 20:09:17 +08:00
lane.wei
21a4b30e1b ENH: update the focus to the new plate when creating
Change-Id: Id7ea18274865966a2e9f89ff0b2eb9799de8e19f
(cherry picked from commit 3e13db7f0a2b29201f76b4721259fc2829abe68c)
2023-02-22 20:09:17 +08:00
chunmao.guo
fc96370abe FIX: update po text
Change-Id: Ib120d6725031419e00a6098a40886859783f0b3e
2023-02-22 20:09:17 +08:00
chunmao.guo
a6b2a0d9fd FIX: support_style display value mistake
Change-Id: I506f5cb8b83dd7794b9b58a2d154ac3842f79dc5
(cherry picked from commit 3338bbd056912cd0555677b078a2eaf56924428d)
2023-02-22 20:09:17 +08:00
tao wang
72a3828531 ENH:add chinese translation of humidity descriptions
Change-Id: I51a22dde87f5f0eaec44bfe41b3751cd4f12cd9e
2023-02-22 20:09:17 +08:00
tao.jin
240d106d58 NEW: check privacy update
Change-Id: I260fbc20cdddbdadd38f1470a2e7050ee1ed14cd
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-22 20:09:17 +08:00
Stone Li
b1a310cf74 ENH: parse nozzle_diameter
Change-Id: I408f93cd0e527e0a78714d2140750076a4cc7a81
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-22 20:09:17 +08:00
gerrit
cd45f984ff ci: update build version to 01.05.00.51
Change-Id: I74b5e02ddf32c92a716d9f37066c0828b5fab9a1
2023-02-22 20:09:17 +08:00
qing.zhang
7d17bb538a ENH: fix BBL.json & change first layer height of process
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: Ib9d849815760a79ffe933336b2df25594c3881e2
2023-02-22 20:09:17 +08:00
liz.li
6114a415cf NEW:add statistics of all plates in preview
Change-Id: Ia93ca5a31d07ae5d52a37bb7b6fb0e3b26cfd012
2023-02-22 20:09:17 +08:00
Stone Li
b731ac8db8 ENH: support load and edit with virtual tray
Change-Id: I36cd8d9f6da719526c38b7479625ed0fa868f63b
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-22 20:09:17 +08:00
Stone Li
71ef9e946c ENH: support ams auto switch filament for P1P
Change-Id: I18df1c962c8289931ba8f8978752c879c13cb648
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-22 20:09:17 +08:00
lane.wei
385854ff2a ENH: refine the logic of shared mesh
when the original shared_mesh can not be found
we will insert the first one as shared

Change-Id: Iea2f505584fcc8fc1f9bbd3882209b042b007a92
2023-02-22 20:09:17 +08:00
salt.wei
10432abf27 ENH: generate placeholder of first non-support filament
This placeholder will be used by start gcode
to avoid calibrate support filament which is
the first filament.

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I7c8d206346bf3d3a5325c06abb24c58834f7f505
2023-02-22 20:09:17 +08:00
lane.wei
945d43c8b8 ENH: change the log level of 3mf writing
use a wrong level previously

Change-Id: I8e0269b893b029a3eea72999ffe05006b5c5e4c7
(cherry picked from commit 0a7a6bb49fbf496870ac7f6c3b4d0e84280cfecd)
2023-02-22 20:09:17 +08:00
Arthur
bf8f163b5a ENH: improve tree support and fix a bug
1. use tree slim's merge strategy in hybrid support
2. do not break bridge in hybrid support
3. fix "support on buildplate only" not working. The cause is: with
   independent support layer height, contact_nodes are not synced with
   object layers, so the previous way of accessing contact nodes in
   unsupported_branch_leaves no longer works. To fix that, we add
   obj_layer_nr.
   Jira: STUDIO-2250

Change-Id: Idfc9b0bb10425de6414f7eae2cf5467cedf1d669
(cherry picked from commit 8780d5a7e92e298cbbccbb3bd1825197d387a340)
2023-02-22 20:09:17 +08:00
lane.wei
5df5cb9ff4 FIX: smooth_nodes may crash due to broken parent-child chain
Change-Id: I770df691b41c6f18a0cb97e49e9e2251afe02e1a
(cherry picked from commit 2b5cdf0337fff277f7b949da568d6cdaa28a0d35)
2023-02-22 20:09:17 +08:00
chunmao.guo
8d7fb45164 FIX: [STUDIO-2243] transfer indexed config with main key
Change-Id: I4930dfc2e86902eb3be9d8624dbad08a82bf82bc
2023-02-22 20:09:17 +08:00
lane.wei
f3af4558ce ENH: translate old models to correct position
Correct the position of some old models

Change-Id: I5105dacff5d6b2895507fb57d77197334a651b47
2023-02-22 20:09:17 +08:00
chunmao.guo
a03dc779b6 FIX: [STUDIO-2186] hide PopupWindow on alt-tab
Change-Id: Ie1bffdd9ace2c6e05979743da9f75ca2c1e87cf4
(cherry picked from commit 7ddaf5260df19c76fca82e525caca26e55732fa9)
2023-02-22 20:09:17 +08:00
战马
5f69f4c016 FIX: Revert "[STUDIO-2186] hide PopupWindow on alt-tab"
This reverts commit 3b8c11659a6cf3062ad27772348b84be5001a4f6.

Reason for revert: update pick

Change-Id: Id991af5b4a5950ee76ecf59176eabc72c885db88
2023-02-22 20:09:17 +08:00
chunmao.guo
5c61c834b0 FIX: [STUDIO-2207] update_compatible on load user presets
Change-Id: Id410c9e0ec68031c0517285daf8a24b998ba2eda
2023-02-22 20:09:17 +08:00
chunmao.guo
81dea77932 FIX: [STUDIO-2186] hide PopupWindow on alt-tab
Change-Id: Ie1bffdd9ace2c6e05979743da9f75ca2c1e87cf3
2023-02-22 20:09:17 +08:00
Stone Li
6faecbf718 ENH: move get_user_machine_info to new thread
Change-Id: Id034346550e356c958aa35f0b12e7a2730078e4a
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-22 20:09:17 +08:00
Stone Li
6fee9bcca1 ENH: parse ack of upgrade confirm
Change-Id: I33691749221aac4c83f71d6d76708d7b2d8d6d4d
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-22 20:09:17 +08:00
liz.li
8c923804fc ENH:adjust preview slider UI
Change-Id: Idc5ba3ed44d04cdcd0d7d124d57b689e1af2a8b1
2023-02-22 20:09:17 +08:00
tao wang
bb5c614b71 NEW:update the new ui layout of ams mapping window
Change-Id: I3a5efbba2400481b5edfcf9e22aab142bf30a4f8
2023-02-22 20:09:17 +08:00
tao wang
f29b41a6c1 FIX:fixed chinese name display error in only gcode mode
Change-Id: I86be69ec9f9577fc658516ea9b86d99d59e78bb1
2023-02-22 20:09:17 +08:00
tao wang
f542f6f51e ENH:the negative volume will not display fillment in object table
Change-Id: I25f000c7770378e7919f9be8869c6320867d1ecd
2023-02-22 20:09:17 +08:00
Stone Li
7ecc8a9834 ENH: use a rare unfrequent port
Change-Id: I29cd679c9d1e435170cbd091cd85a0973cca1012
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-22 20:09:17 +08:00
Stone Li
0aa2916d4b ENH: update ams gcode when loading filament
Change-Id: Ia837249e79702693f61cd4e170342ef1e1d8427c
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-22 20:09:17 +08:00
Stone Li
dd792048a0 ENH: do not block GUI when downloading hms file
Change-Id: I2175c86caba66c54e8a708a402bc3595e1e77ac9
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-22 20:09:17 +08:00
liz.li
e7ea07944f ENH: custom gcode info should be owned by every plate
Change-Id: I5e5b000b7d04354d3c3cc311d089cb591a37501e
2023-02-22 20:09:17 +08:00
liz.li
5f71eba979 ENH:add some global shortcut key
Change-Id: Ib29d13c84755b0e4e15b6a4c25583df91653aa84
2023-02-22 20:09:17 +08:00
tao.jin
688084c475 NEW: add print sequence setting to plate
Change-Id: Ic4acb68743442a49dee04702e7a8073b6641bc39
2023-02-22 20:09:17 +08:00
lane.wei
a2431d7965 ENH: add logic to convert hybrid(auto) to tree(auto) for old 3mf
Change-Id: Id35e28b295be0a4b4398b438d5e6237e05f387e5
2023-02-22 20:09:17 +08:00
lane.wei
9dceb42ba3 ENH: validate the config from 3mf and give some hints when there are errors
Change-Id: Ic25e5426e4e85a35a6a2413109f47b653955ec78
2023-02-22 20:09:17 +08:00
lane.wei
84eebfc729 ENH: refine log level for cli
Change-Id: I781319ae85bff77f58931689f589b53e0e778389
2023-02-22 20:09:17 +08:00
liz.li
60e408bc59 FIX:delete logic shall be the same as arrange logic
Change-Id: I8c6d06abd7a850147e0e7f731bddbdeafcae777c
2023-02-22 20:09:17 +08:00
qing.zhang
0b0a1a3d48 FIX: fix adjust of cooling time
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I5eae0ed7e53fddb18c99f510373ba5a687fd2c8e
2023-02-22 20:09:17 +08:00
qing.zhang
c909fd9178 ENH: start gcode midify
move to the middle upper edge of plate and ratract after calibrating to avoid leakage

Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: Idb09aaafee3bfccfd7c14d1140778498195b98c3
2023-02-22 20:09:17 +08:00
qing.zhang
bcd3ec146c ENH: mult height process for diff nozzle
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I26dec4431dba40dd35cc4038c674c6108e607304
2023-02-22 20:09:17 +08:00
qing.zhang
4b86b978d1 ENH: STUDIO-2221 adjust cooling time for each layer
sub filament change time from layer time to adjust
layer speed

Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I2f1c41a36946765b74ecad58ce102abe98e00dac
2023-02-22 20:09:17 +08:00
salt.wei
209c50f50d ENH: fix for collision when print by object of multi color
Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I3d8b285dedb13ecbb5df38d46293680d9a0c1a61
2023-02-22 20:09:17 +08:00
liz.li
aac9bfd593 ENH:add some shortcut of gizmo
Change-Id: Ie639483663f5fa9fe3cd597fb279d95474969408
2023-02-22 20:09:17 +08:00
chunmao.guo
e9c443fcd7 FIX: [STUDIO-2205] select sync all AMS filaments or only changes
Change-Id: I027158e2baa355c6147fea4d45b63ba564b18d0c
2023-02-22 20:09:17 +08:00
chunmao.guo
6a33848a6d FIX: [STUDIO-2234] wxMediaCtrl2 Stop twice on macOS
Change-Id: I645ada1b00a6d43e29a743b8f83f39fa75481a63
2023-02-22 20:09:17 +08:00
qing.zhang
bb53da59e7 ENH: warning when skirt layer bigger than 1 in by Object mode
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I16ff3d2a88f02d106cfe58d345f92e26728e4157
2023-02-22 20:09:17 +08:00
chunmao.guo
15126bda6d FIX: z_hop_types extruder_idx
Change-Id: I277811d78af89049fc466c16cfb968ffbd281831
2023-02-22 20:09:17 +08:00
liz.li
e1f97681f4 ENH: optimize layer time(log) display
Change-Id: Ibb43561f11dfd1c63b3a0da75a3cb10b95afc71e
2023-02-22 20:09:17 +08:00
qing.zhang
e69c0ed7f6 ENH: STUDIO-2113 fix spiral lift in crossing wall mode
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I73f0d7fd6679d4e9645de4e7212e1b364cb7ea31
2023-02-22 20:09:17 +08:00
lane.wei
97acb54695 ENH: remove Christmas cabin from homepage
the codes have been removed from web before

Change-Id: I39c2b63c1a4ffa276b7d406eca9fc1f910fb31a9
2023-02-22 20:09:17 +08:00
lane.wei
b844ee9dd1 FIX: fix the thumbnaile not saved issue
STUDIO-2148: we need to update the GLVolume's position after ensure_on_bed
Change-Id: I69fbaca653de50bf5e684e0b4073faa4dfcbed8f
2023-02-22 20:09:17 +08:00
zorro.zhang
a934fac180 ENH: remove Christmas cabin menu
Change-Id: Idb01d9f24eacdaec8e2451f6021a8428bae1858f
2023-02-22 20:09:17 +08:00
tao wang
71a0c8302f ENH:add protection before filament blacklist check
Change-Id: I53a85509fbe7cd92478f49b2403cfc3ad551e0e7
2023-02-22 20:09:17 +08:00
MusangKing
ceb923bc2b ENH: adjust overhang threshold angles
JIRA: [STUDIO-2226]

0.4mm nozzle contains different layer heights but has
the same preset threshold angle (30 degree) which is not reasonable.

Hereby, five of them are adjusted based on the overlap ratio.

Change-Id: I96300bf202c3a5fc4428186875a9212c32524ff2
2023-02-22 20:09:17 +08:00
wintergua
4536ed9ae2 FIX: brim generation error in XY compensation and first layer fixing
now, when XY compensation with negative value is assigned, the brim can be
generated correctly (Studio-2222). In addition, one can add brim to a model whose
first layer is empty while second layer is not empty (studio-1286).

Change-Id: I28443dc6e28bc6fff8c92d3cc35ab7a416d43138
(cherry picked from commit cb62afcfd295ca93962d99350d1dfaf3441c4759)
2023-02-22 20:09:17 +08:00
liz.li
e994cd02e2 ENH:add some translate
Change-Id: Ic635f5f85f67662339edd28d87a4a37232d5bc0e
2023-02-22 20:09:17 +08:00
chunmao.guo
cbb84d2fb6 ENH: support filament_z_hop_types
Support override z top type in filament

This is handling for STUDIO-2082

Change-Id: I885d1d5e44d626e28b260ff569d0359e462a5f8d
2023-02-22 20:09:17 +08:00
Arthur
3a14acba99 FIX: support styles were not translated
Field labels are translated when being appended to combo box, so need to
add _ symbol.

Change-Id: Ib5207c4d357c3b9cd797264f872e2f6fb8859e6e
2023-02-22 20:09:17 +08:00
chunmao.guo
225b68034e FIX: [STUDIO-1556] not show plugin download dialog again
Change-Id: I7eccb94f7c6ba69fe316c374b5f19f57cbc0fa18
2023-02-22 20:09:17 +08:00
Arthur
92022bd809 ENH: translate "No layers" and others
Change-Id: I654490a5e4049dbeb61ef7499adfddfe94bcbcf6
2023-02-22 20:09:17 +08:00
Stone Li
6122f5010a ENH: sync with localazy and fix compile error
Change-Id: I7cae72f24c2fde61e0c1e99c89c21801b7d10125
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-22 20:09:17 +08:00
zhimin.zeng
ecd8418640 FIX: Unnecessary heat up when flush volume is 0
Change-Id: I5e0143d8b94ba4007a47ba3edb7277ee64bfafdb
2023-02-22 20:09:17 +08:00
Stone Li
fbc4de136f NEW: support to config ftp_folder for printer [P1P]
Change-Id: I6a3b2a67d2950e2c1c5267bb7c65d5594924caec
Signed-off-by: Stone Li <stone.li@bambulab.com>
(cherry picked from commit 176e505bcf5f48971302d9aff14e74b118eeafbe)
2023-02-22 20:09:17 +08:00
Stone Li
6674aced8f ENH: add prefix for ip in boost::asio
Change-Id: I19e4e470207d9cf98259be112829b089c1ce23eb
Signed-off-by: Stone Li <stone.li@bambulab.com>
(cherry picked from commit 52e0d20b94d52b48ce25c8f2452a16cafd05e7a8)
2023-02-22 20:09:17 +08:00
chunmao.guo
3065771b2c FIX: [STUDIO-1746] transparent background for images of swtich button
Change-Id: I30012a756242816a69099d211bea444bebc4277d
(cherry picked from commit b1efb320cc4290406001994d45b0ef182d6cce30)
2023-02-22 20:09:17 +08:00
gerrit
af7c6502f3 ci: update network module based on commit 78ea7a8
Change-Id: I161dc948209360532d99f752c89f77e1346cc866
(cherry picked from commit de74a4cdbc2776a9d6b7ef3e6f4b6f53c11ceea1)
2023-02-22 20:09:17 +08:00
Stone Li
cb2334559b NEW: add http server in BambuStudio
Change-Id: I72d99277187ea0d6b600e741dcc4306bc5f44036
Signed-off-by: Stone Li <stone.li@bambulab.com>
(cherry picked from commit 9ee36044158856e433b19e407094120bd15f4aa0)
2023-02-22 20:09:17 +08:00
Arthur
5cbea66058 ENH: add translation macro to "No layers"
Jira: STUDIO-1876

Change-Id: I7a6fdf64b27d2eb40346a0025fd9afe5944dd7b7
(cherry picked from commit 71f580b34434d1a6582a20429c38ea3f6d1875fd)
2023-02-22 20:09:17 +08:00
chunmao.guo
4b8f197e1d FIX: show ip/code dialog no-delay on user triggered failure
Change-Id: If9f469f3379de972a51bf581d41c379e8f982bb9
2023-02-22 20:09:17 +08:00
tao wang
afb8f47111 FIX:Fixed that AMS icon is not clear in dark mode
Change-Id: I22136d4d3b3730871131cacd8a9c1deb8965bd73
2023-02-22 20:09:17 +08:00
tao wang
4fb94330f4 FIX:fixed jpeg pictures cannot be set as cover thumbnail
Change-Id: I35b5f4fd2ebd31cbd0812ef3111cc18152f24582
2023-02-22 20:09:17 +08:00
tao wang
3f109501ba ENH:optimize the management of access code
Change-Id: If8a3644207d5bca2bb10f49f8ee251b6b6219ce2
2023-02-22 20:09:17 +08:00
liz.li
21cee56dbf FIX: (mac) auto-calc button display problem
Change-Id: Ib08e5e1dba9e39660eddc84cc513710caf823ffe
2023-02-22 20:09:17 +08:00
chunmao.guo
54e47bba33 ENH: support styles to sets
Change-Id: I18d4add12907d4d4a10980c1f1244e287934c34c
(cherry picked from commit 8ead53319222a2ab4bd76b434afcd657e5045fc7)
2023-02-22 20:09:17 +08:00
liz.li
b3c4447191 FIX: spiral vase mode layer number
Change-Id: Iac96f790e4030d2eac5666517d37919926cd85c3
2023-02-22 20:09:17 +08:00
qing.zhang
a726628657 ENH: cut travel before wipe
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I3b5dfc19c601e0cd72a4fd7fe320791f1d10c87b
2023-02-22 20:09:17 +08:00
salt.wei
df84229adb ENH: promote the precision when transfer step to mesh
Previous precision is not enough, and some mesh is not
of good quality.

This is handling for github issue #825

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I68901b41c1a3279c61678dbbcc93c887020f18a7
2023-02-22 20:09:17 +08:00
liz.li
d708f5d521 ENH:add time unit of layer time
Change-Id: I55d6ee00b0dfdc1ed11f9f236aec5d338fef9dd2
2023-02-22 20:09:17 +08:00
tao.jin
c2eeb2522b FIX: display of Label and warning dialog
Change-Id: Ib147f28096336b07b033c2e8104a56f5c28b7d93
2023-02-22 20:09:17 +08:00
tao wang
7c728452a2 NEW:add filaments not supported by detection
Change-Id: I1cabf8631e77fbaf42d2b30ee3e715c8f2459bda
2023-02-22 20:09:17 +08:00
tao wang
33c22bef62 FIX:use the gcode line command to unload the C11 printer
Change-Id: I33eec56b8c02fd605d3c0acb4e1f9d07811cea69
2023-02-22 20:09:17 +08:00
tao wang
a94b78d296 ENH:add network verification process for LAN printing
Change-Id: I0a9e9fa5e9746f5ceb989b00c6b44e812d071132
2023-02-22 20:09:17 +08:00
Arthur
088668994c FIX: bottom bridge was not correctly detected
A bottome surface is detected as stBottom only if:
 1. has support, top z distance=0 (soluble material), auto support
 2. for normal(auto), bridge_no_support is off
 3. for tree(auto), interface top layers=0, max bridge length=0, support_critical_regions_only=false (only in this way the bridge is fully supported)

 Note:
 Since now the surface type depends on more parameters, changing them will trigger re-slicing and making the whole process slower.

github issues: 1253

Change-Id: I0fe719e0dbf7147206008c8726dd9c7be2b19226
(cherry picked from commit d4490afa6b9e4fbb583033a125bbebb50dc5f0bb)
2023-02-22 20:09:17 +08:00
tao.jin
49bc67eed1 FIX: crash of login dialog after switch language
Change-Id: I8f0f9249256f9339fb416680a233973f64654768
2023-02-22 20:09:17 +08:00
chunmao.guo
d0f2f0b28d FIX: [STUDIO-2183] presets/filaments unorderd in BambuStudio.conf
Change-Id: I3a286c356cc23f970462e6f24d99b4b038e321e7
2023-02-22 20:09:17 +08:00
chunmao.guo
881e25e2a2 FIX: [STUDIO-2150] not save remain configs on no-to-all
Change-Id: I7174a0639599919e43c9110016911db179178d7c
2023-02-22 20:09:17 +08:00
chunmao.guo
b3a4384aec ENH: save ams list to compare with last sync
Change-Id: I44db0b0a61cf366929aed6ab703407e5d9b170b7
2023-02-22 20:09:17 +08:00
tao wang
ddf8c216c6 FIX:fixed display conflict between speed popup and humidity popup
Change-Id: Ib344aa829d3172e29a5d58a7b7f3b5d2d7d6c9a1
2023-02-22 20:09:17 +08:00
liz.li
78b6e75955 ENH:add a search box for text toolbar
Change-Id: If8a43671916e56d6cb52b9fbd21dd8b8f9539083
2023-02-22 20:09:17 +08:00
Stone Li
ac854d8f4d FIX: fix export all sliced file in file menu
Change-Id: I88bb63eb69a370e9824a87b1708e1021a28eaeb9
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-22 20:09:17 +08:00
qing.zhang
8e50744d2a ENH: add ANYCUIC profile which based on SoftFever
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I85fc64a25dbb761377c63574b3d3ec10fda9dfd6
2023-02-22 20:09:17 +08:00
liz.li
6bfd1a4322 FIX:the last char in a new line didn't display
Change-Id: I0bc21764259d93277e16db02ece838fcfed0b657
2023-02-22 20:09:17 +08:00
liz.li
407a863a6f ENH:add a tooltip
Change-Id: Id4180bb06d1b89a461697be7a7655f3aa9c3873e
2023-02-22 20:09:17 +08:00
tao wang
c000ab2d8a ENH:add network detection for LAN mode printer
Change-Id: I0e3616b08f1a455df05c98c3b194ff9177df3ff1
2023-02-22 20:09:17 +08:00
tao wang
9936c2b823 ENH:lan mode printer will display the identification of LAN
Change-Id: I39535210fcf5720918c7d5425032d9ff450e4840
2023-02-22 20:09:17 +08:00
tao wang
4667c7df0e FIX:fixed text of side tool displays errors in French language
Change-Id: I1160fce191c77f92c1aa616dfffc46bfb9d5034f
2023-02-22 20:09:17 +08:00
tao wang
450f3e1c77 ENH:optimized logic related to fan control
Change-Id: Ia67525bc75d4cc5be02eaf7131764fb0f9584f23
2023-02-22 20:09:17 +08:00
tao wang
3e07db0c2a ENH:update the msg text when the printer does not have an SD card
Change-Id: Id3c79c7415b728b91979a117f3496ecf8c3f8f45
2023-02-22 20:09:17 +08:00
salt.wei
de4e087b5b ENH: small change for warning
Handling for jira-1966

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I4deb68fad55f373be86004f53e4b296da4b5b7db
2023-02-22 20:09:17 +08:00
tao.jin
9b42d0d630 FIX: camerapopup dismiss, control panel rescale
Change-Id: I83fcf72f4aaddcf58f0c626bfe2a369a4091ac65
2023-02-22 20:09:17 +08:00
zorro.zhang
2b35961960 FIX: correct japanese of logout
Change-Id: Ie7e9e1dce591ac16cbc65398466269912925e7e6
2023-02-22 20:09:17 +08:00
zorro.zhang
2568d52825 NEW: Japanese text in userguide
Change-Id: I5e7e15e8fa255715fa3a08b39bac9bf8e8bd3c05
2023-02-22 20:09:17 +08:00
Stone Li
c5ddedc308 ENH: update ams load/unload gcode
Change-Id: I3b65ef0492c456e75827692d434250bc21dbcf65
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-22 20:09:17 +08:00
qing.zhang
ab0ba360e4 ENH: STUDIO-2171 update PC temp & TPU 95A's max vol
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I229c8634971a20dbdff548ad16d80f0129e76079
2023-02-22 20:09:17 +08:00
tao wang
1fc0a752db ENH:add the function of using FTP only
Change-Id: If2dc3d1c9d913d1aacd426640a01a714d45a6774
2023-02-22 20:09:17 +08:00
Arthur
59f7c4595c FIX: arranging multi-color objects not correct
Arranging multi-color objects with disabled
multi_materials_on_same_plate option was not currect.

Previously we only consider the first extruder id for multi-color
objects. Now we consider all extruders.

Jira: STUDIO-2164
Change-Id: If64ff4f88f0fe4f6c31ebf657b3449b19bf063f0
(cherry picked from commit f4f6bdd00a0c3d3e13406b69be9b5b0468b27d44)
2023-02-22 20:09:17 +08:00
Stone Li
126ef98690 ENH: modify config for P1P
Change-Id: Ib05a2d627ac921ad3e017817e48fbac527b4acf4
2023-02-22 20:09:17 +08:00
Stone Li
f4bd9dac87 ENH: set amsMapping info when use_ams is false
Change-Id: Idd7c8ca171806fcf5897eb6f257bb68e68ec8070
2023-02-22 20:09:17 +08:00
lane.wei
c26c9b8602 ENH: update version to 1.5
Change-Id: I114766e4f0304a97cb18e2762be18dae68e667db
2023-02-22 20:09:17 +08:00
Stone Li
c475527808 NEW: replace gcode of ams load and unload
Change-Id: I89a1f3e6787c4639c2757e31676dbd15b17331ea
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-22 20:09:17 +08:00
SoftFever
27271a69f6 take flow ratio into account for max volumetric speed test 2023-02-21 19:07:20 +08:00
SoftFever
c8687989e5 fix a bug that new overhang slowdown algo didn't work properly for cloned objects 2023-02-21 01:28:42 +08:00
SoftFever
04fe631245 bump version to 1.4.5 (#328)
Signed-off-by: SoftFever <softfeverever@gmail.com>
2023-02-18 23:25:48 +08:00
SoftFever
30bb644e2b bridge accel
Signed-off-by: SoftFever <softfeverever@gmail.com>
2023-02-18 20:48:51 +08:00
SoftFever
361a5dce6f tweak overhang fan
Signed-off-by: SoftFever <softfeverever@gmail.com>
2023-02-18 20:09:57 +08:00
SoftFever
8aad9a844a fix a small bug of bridge density
Signed-off-by: SoftFever <softfeverever@gmail.com>
2023-02-18 12:21:13 +08:00
SoftFever
40e9424bdf fix typo
Signed-off-by: SoftFever <softfeverever@gmail.com>
2023-02-18 11:45:42 +08:00
Heiko Liebscher
0cc7319ac8 fix new features in german after pr (#326) 2023-02-18 09:20:48 +08:00
SoftFever
851f475975 Move precise wall to Precision category
Signed-off-by: SoftFever <softfeverever@gmail.com>
2023-02-17 23:44:48 +08:00
SoftFever
d72a6d218f fix PO/MO
Signed-off-by: SoftFever <softfeverever@gmail.com>
2023-02-17 23:44:48 +08:00
SoftFever
dfd658c00c Cherry pick some fixes from mainstream
FIX: crush when slicer multi-color model

the root cause is a mismatch between the dimensions of flush matrix and the number of extruders

Change-Id: I3a4ca706cb24d9e5d33969b9e6f5b288e71bb8f2
(cherry picked from commit 7399037eaacdfd7d8407667a2e5a097757265254)
FIX: fix crash when switch printer

Change-Id: I7632689c5df07df0222a5fa529993e114d7c5b08
Signed-off-by: Stone Li <stone.li@bambulab.com>
ENH:close the amsmapping dialog when exit seletmachine dialog

Change-Id: Ib49b1f9d08267c56b34d867edb40f287114479e1
ENH:no longer hide the unload button when connected to AMS

Change-Id: I62c7195d590827bd189c6e6886e95c2cf755e203
FIX: fix the slicing result different issue

when move volume in objects copied from other object
the result is not correct

Change-Id: Ieebc586f11c42429902d653e871c038d096783e8
FIX: support blocker not work on vertical+horizontal faces

Jira: STUDIO-2088

Change-Id: I6803e8e90ebcc4c67d81473f60fdf97929011e12
(cherry picked from commit 738800c5af48ab8a2cde40b6f2b3c48a88bfee8b)
FIX:fixed send print will crash when resources path is chinese path

Change-Id: Ie4a5161f853dca691bd69e5695720d99148a0134
2023-02-17 23:44:48 +08:00
SoftFever
e9613e971d 1.4.5 features (#319)
* Changes:
Improve precise wall
Port PS2.6 overhang slowdown feature
Implement overhang fan for new overhang slowdown algo
Add option to switch between classic/new overhang slowdown implementation
Set Arachne as default engine
Small adjustment of temp calibration range
turn off small perimeter by default
Small UI tweaks
Change default top_surface_pattern to monotonic
Fine tune jerk

Signed-off-by: SoftFever <softfeverever@gmail.com>

* Disable optimizations for RelWithDebInfo

Signed-off-by: SoftFever <softfeverever@gmail.com>

* fix an issue that max volumetirc/vfa calibration can't send to print

Signed-off-by: SoftFever <softfeverever@gmail.com>
#322

* fix build errors

Signed-off-by: SoftFever <softfeverever@gmail.com>

---------

Signed-off-by: SoftFever <softfeverever@gmail.com>
2023-02-17 23:09:18 +08:00
Heiko Liebscher
0e0b8d297e fix_compiler_error no viable overloaded '=' (#314) 2023-02-17 00:03:41 +08:00
behold81
2f5bb03023 New printer: TwoTrees SP-5 Klipper (#292)
* Add files via upload

First working version of TwoTrees SP-5 running klipper. this can be the base to start using this slicer. most of the generic materials are OOTB ones and this profile is made for near stock printers just running klipper. roughtly running a max speed of 200mm/s and runs successfully

* Add files via upload

* Delete SP-5.png
2023-02-14 00:02:22 +08:00
SoftFever
7fe5b84c41 more calibrations
precise wall
etc

Signed-off-by: SoftFever <softfeverever@gmail.com>
2023-02-11 09:55:58 +08:00
SoftFever
b69a9663e1 tweak small perimeter
Signed-off-by: SoftFever <softfeverever@gmail.com>
2023-02-09 19:56:09 +08:00
Stone Li
d31250cb40 FIX: fix crash when switch printer
Change-Id: I7632689c5df07df0222a5fa529993e114d7c5b08
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-08 10:57:24 +08:00
chunmao.guo
7a266ca36a FIX: use shmget according to bambu_source
Change-Id: Ic791498d4ef1bb012953783222b21e8a0394e3b8
(cherry picked from commit 2893425cdfb688e1b96a38186abef1450f530685)
2023-02-08 10:57:24 +08:00
tao.jin
fb53afe969 FIX: task thumbnail state update
Change-Id: Ia9cfcf0c05dafbe377f52f63b23cf929ef95874c
2023-02-08 10:57:24 +08:00
SoftFever
a1476784c4 fix z hop bug (#279)
Signed-off-by: SoftFever <softfeverever@gmail.com>
2023-02-03 21:48:43 +08:00
lane.wei
ad9eccc5f4 ENH: gstreamer: use gst_clock_get_time insteadof gst_element_get_current_time
gst_element_get_current_time is only available since gst 1.18
2023-02-02 16:53:45 +08:00
Arthur
63222d50de FIX: unsupported cantilever was not warned
1. fix unsupported cantilever was not warned. We need to set support
  type to stTreeAuto in is_support_necessary() to fully utilize the
  power of feature detection.
2. fix tree support not generated on non-first plate.

Change-Id: I5b8aa827c9d62df0119db4e8e9212f33ce75ddaa
(cherry picked from commit 60f21b6fcb45fe56f7fc867a7fcad433282bc055)
2023-02-02 16:53:45 +08:00
lane.wei
05595daf4c ENH: linux: refine the build action for linux
only triggered by pull_request

Change-Id: I3382007f3cd21d8a1bd427bd75dd51a008cd7e5a
2023-02-02 16:53:45 +08:00
lane.wei
f8258e94b7 ENH: refine .gitignore
Change-Id: I2bf43bf36b588c6edb8bf0cbeec8e62356b527b9
2023-02-02 12:14:41 +08:00
chunmao.guo
86329cf722 FIX: [STUDIO-2112] fix process bar layout overflow in German language
Change-Id: I301653a92927e6933adc6316709681e8b05f32fe
2023-02-02 12:14:41 +08:00
chunmao.guo
dbdef05f2e FIX: [STUDIO-1908] device ftps to implicit_ssl
Change-Id: Iaa347ea17d76b7bafc0ea213217bfbc2b6c916cd
(cherry picked from commit 702d1c1e6605834746b38dedc725fe67ad4edfa6)
(cherry picked from commit 2019750d9c03a97b9b3f746d90e4f1122d81b12c)
2023-02-02 12:14:41 +08:00
chunmao.guo
ee0f3c7a2f FIX: [STUDIO-2099] fix start new instance with renamed app
Change-Id: Ic4ee24c3980f02d436ebf32c2b5c63cb34f3803e
(cherry picked from commit e4c2ff2a442253832b44bcd5e9e0ac40980cfcee)
2023-02-02 12:14:41 +08:00
chunmao.guo
7fe0ee091f FIX: [STUDIO-1908] add printer cert and version compatible
Change-Id: I6aef8c1169952a0b541516ab3a0d7de2d3e213b3
(cherry picked from commit b0bbb571c7c54e81cd52262d334eb1463c3550e7)
2023-02-02 12:14:41 +08:00
Stone Li
3e8671bcdf FIX: fix lan_file mode for P1P
Change-Id: I71ffdb28363fe45b2d5bab01d34846c2462921a6
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-02 12:14:41 +08:00
chunmao.guo
21a6281998 FIX: [STUDIO-1997] SpinInput messureSize
Change-Id: I5923248b4980cb7638ce683d4e32e9c271b102cd
2023-02-02 12:14:41 +08:00
chunmao.guo
00221d8652 FIX: [STUDIO-2004] text in ConfigsOverwriteConfirmDialog
Change-Id: I98f2159ccf467782edb25d5cdfecd468e4346fe7
2023-02-02 12:14:41 +08:00
tao wang
0ecf7c8265 ENH:no longer hide the unload button when connected to AMS
Change-Id: I62c7195d590827bd189c6e6886e95c2cf755e203
2023-02-02 12:14:41 +08:00
tao wang
150ed6a2d5 ENH:close the amsmapping dialog when exit seletmachine dialog
Change-Id: Ib49b1f9d08267c56b34d867edb40f287114479e1
2023-02-02 12:14:41 +08:00
tao wang
39f32c22f5 FIX:fixed the top button hidden after the main window has resize
Change-Id: Id757f8d2816c6d1b07da2c67d8407ec49d76cc24
2023-02-02 12:14:41 +08:00
zhimin.zeng
8887bc3af9 FIX: Incorrect results for multi-color object slicing
Change-Id: Ia2f96d3afb128faa72b6872bcbe2914ddcbe71fe
2023-02-02 12:14:41 +08:00
zhimin.zeng
824fea276e FIX: modify the minimum value of height range(painting).
Change-Id: I8f335b54a793aa9fc8c0f31b45322a1a90ed55f4
(cherry picked from commit c33e0971d2a24ab49dd04c3c571a8a852555e0ad)
2023-02-02 12:14:41 +08:00
zhimin.zeng
217234c8d3 FIX: Support Filament is being "Flush into objects' infill"
When using "Flush into objects' infill" with support filament, it also get's flushed into the object's infill which shouldn't be happening.

Change-Id: I0f1cb3d5ee3cf5489ccab957989c6c24336f8845
(cherry picked from commit f83e63feb3ad5a14b0f4304e2e6fb1c5828270ec)
2023-02-02 12:14:41 +08:00
zhimin.zeng
c225481a5d FIX: modify filament change travel path(toolchange_count == 2)
Change-Id: Ieca0aeb236582015e5e4e53629ef66567f420e7a
(cherry picked from commit 7d5c45ec46dace26c3e5ae35e8d11e7a7d54fcc2)
2023-02-02 12:14:41 +08:00
liz.li
6279158aba FIX: slice plate crash at gcode_result
1.fix an occasional crash when slice a new plate after sliced.
2.layer height/line width/flow/fanspeed/temperature shall not display at travel/retract/wipe move, this five only display at extrude move.

Change-Id: I4d9f9d329b5ea656c42cb421ba54123ef7f2d6c5
2023-02-02 12:14:41 +08:00
Stone Li
b30ed7bd9f ENH: display unicode for Japanese
Change-Id: Icf3f926901bd0fe2cc2a5c160eb1aaef3ed29977
2023-02-02 12:14:41 +08:00
zhimin.zeng
c0ee8d4f0f FIX: remove duplicate flush_volumes
Change-Id: I86e3cc1ccd997e5c61915052e70c426bead289b1
(cherry picked from commit 1a615790fe0ac39d9ce0776079c34cf7f2c6217b)
2023-02-02 12:14:41 +08:00
lane.wei
1fe0d7be8c ENH: refine some small logic
1. continue post_init when gl window not ready under linux
2. use deleted_wipe_towers in reload_scene to judge whether it is deleted

Change-Id: I5be2ac876842e5432d254d47e4fe31f066455106
(cherry picked from commit 5e61a21d5662ccc656136b6a219c2358364c36d9)
2023-02-02 12:14:41 +08:00
SoftFever
fe9a2715e6 New feature: bridge density (#275)
Signed-off-by: SoftFever <softfeverever@gmail.com>
2023-02-02 00:43:36 +08:00
fang64
fe5629f0ed Add GitHub Action Workflow to Build AppImage 2023-02-01 21:12:20 +08:00
fang64
472da36b7e Add support for AppImage build in containers. 2023-02-01 21:12:20 +08:00
fang64
1693086504 Add -r flag to BuildLinux.sh to skip ram check 2023-02-01 21:12:20 +08:00
Joshua Wise
aa2d692910 Linux: ensure that a GLCanvas3D can become active before attempting to start OpenGL (fixes #1149)
On Linux, GLEW requires (at least, in EGL land) that an OpenGL context be
active before glew_Init is called -- otherwise, GLEW doesn't know what
extension symbols to look up.  If glew_Init fails, then some symbols
elsewhere will not exist, and the app will shortly crash.  We work around
this by detecting if we're actually ready for postinit, and if not,
resetting the flag so that wxEVT_IDLE will cause us to try again later, when
the window hopefully has gone into the foreground and is ready to be used.
2023-02-01 16:24:44 +08:00
Joshua Wise
a082ce50ed slic3r: address sanitizer cleanup around wipe tower deletion
When determining whether or not we need to update the object list, we check
all of the objects that are being deleted to see if they're a wipe tower.
Unfortunately, by the time we check, the objects have already been deleted,
and the memory has been freed!  Avoid this by writing down for deleted
objects whether they are wipe towers, and if they were, we can indeed skip
updating the object list.
2023-02-01 16:24:44 +08:00
Joshua Wise
0078c2a22e slic3r: address sanitizer cleanup in GLVolume
Now that GLVolume has a subclass, GLWipeTowerVolume, it needs a virtual
destructor, too.  See:

  https://stackoverflow.com/questions/41552966/getting-new-delete-type-mismatch-from-asan
2023-02-01 16:24:44 +08:00
Joshua Wise
040af5fa98 slic3r: address sanitizer cleanup in TreeSupport::generate_contact_points
In generate_contact_points, the rotated_dims don't actually generate a
Point, but generate an abstract expression that holds a reference to
bounding_box_size.  Unfortunately, this goes wrong because bounding_box_size
ages out instantly; GCC's Address Sanitizer complains that this is a
"stack-use-after-scope" issue.

Interestingly, the Eigen documentation says that this is a known problem
with using C++11 "auto" to generate matrices (which a Point is)!  It is
buried here: https://eigen.tuxfamily.org/dox/TopicPitfalls.html

This is probably an extremely theoretical correctness improvement, and also
an extremely theoretical performance improvement.  But it is an improvement
nonetheless, and, more importantly, it enables me to continue to run the
slicer with Address Sanitizer turned on to find other potential issues.
2023-02-01 16:24:44 +08:00
Joshua Wise
ab64ae8c63 slic3r: address sanitizer cleanup in ImGuiWrapper::load_svg
ImGuiWrapper::load_svg previously could load an image that was not of the
aspect ratio specified by the target_width and target_height, and as a
result, could create an output vector that was smaller (or differently
shaped!) than the target_width and target_height.  GCC's Address Sanitizer
flagged this because init_font was reading over the end of the allocated
buffer, but this also meant that images with incorrect aspect ratios might
get rendered to the font canvas incorrectly.

To solve this, we pass the generated width and height out from load_svg, and
use it when copying images later.
2023-02-01 16:24:44 +08:00
lane.wei
64173b3fa3 FIX: fix the duplicate model issue after open recent project in some corner cases
github issue-1185

Change-Id: I3be5be473cfe7328c4781b1533093cd860e64387
2023-02-01 16:24:44 +08:00
lane.wei
7102a1e235 FIX: fix the slicing result different issue
when move volume in objects copied from other object
the result is not correct

Change-Id: Ieebc586f11c42429902d653e871c038d096783e8
2023-02-01 16:24:44 +08:00
lane.wei
a759df62c4 FIX: fix the model outside issue after repair
a negative-z found and needs to notify plate after ensure_on_bed

Change-Id: Ifc0eb277a16437333036aeef19020471e3ea91db
2023-02-01 16:24:44 +08:00
MusangKing
92f594ea4a FIX: support blocker not work on vertical+horizontal faces
Jira: STUDIO-2088

Change-Id: I6803e8e90ebcc4c67d81473f60fdf97929011e12
(cherry picked from commit 738800c5af48ab8a2cde40b6f2b3c48a88bfee8b)
2023-02-01 16:24:44 +08:00
Arthur Tang
c07dcffe16 ENH: use print volume to clip tree support
So tree supports won't go outside the bed.

Known issue:
1. moving won't trigger support re-calculating, so if you want to
  clip the supports in a different way after moving, you need to change
  the support settings (eg change threshold angle to 31 degrees).
2. clipping with the occlusion region is not complete, and an error
  message of "outside toolpath" will still be popped because we use
  convex hull to detection confliction.

Jira: STUDIO-2036

Change-Id: I643b14618eb18ffa9825072c44f677e51b0ff937
(cherry picked from commit a6217824dc0f490027e16f80f810d176dec6004b)
2023-02-01 16:24:44 +08:00
tao wang
b144aae5bd ENH:optimize the foreground color of release note text
Change-Id: I48f6b1257fed3b1bba085eee2700060dba7c0705
2023-02-01 16:24:44 +08:00
tao wang
563342c450 ENH:output new error: no space left on printer sd card
Change-Id: If4ced6dcb1d6e2ccb5b1ad950744b9958d298fc7
2023-02-01 16:24:44 +08:00
lane.wei
6b15afc7b6 ENH: refine the timestamp when using P1P
the timestamp of mjpeg is not accurate
we simulate one

Change-Id: I9198f1ba930994cc4f86e8d3a3c778539d04ccb3
2023-02-01 16:24:44 +08:00
qing.zhang
3d378563b5 ENH: modify start gcode
fix the text errot of density of PolyTerra
z_hop_type change to auto

Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I7f59d2620b42d2f2092ebb4c01ac3a5455c40a4f
2023-02-01 16:24:44 +08:00
tao wang
625978355a FIX:fixed send print will crash when resources path is chinese path
Change-Id: Ie4a5161f853dca691bd69e5695720d99148a0134
2023-02-01 16:24:44 +08:00
chunmao.guo
5666f8fce9 ENH: [STUDIO-2070] MediaCtrl on macOS: stop on player notify
Change-Id: I9b11a99e8b3f043ff4d8837cda89bc41bfb5eb0e
2023-02-01 16:24:44 +08:00
qing.zhang
6ea24dfd89 ENH: open skirt height
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: Ie709c2f2987a7c351e03cb1e3c5a06817f43df19
2023-02-01 16:24:44 +08:00
chunmao.guo
96d6ec699c FIX: [STUDIO-2071] thread safe when deleting user presets from cloud
Change-Id: I0cce7adc9e0781d38d0b1aa716b2c5f7d43e8426
2023-02-01 16:24:44 +08:00
Arthur
30bb96aa47 FIX: spiral mode couldn't be enabled
Support layers should be released in is_support_necessary.

Jira: STUDIO-2120
Change-Id: Id1c6fa2d8635e55be745095408dfbac38a25efa6
(cherry picked from commit f911e8d084c4fa273f8c9211112fa2f83515cfb1)
2023-02-01 16:24:44 +08:00
Arthur
aa36d376ec ENH: translate "is too close to others" and so on
Jira: STUDIO-2020
Change-Id: I73a4cd47bafc32ff580b7970a37f808f78cffc3e
2023-02-01 16:24:44 +08:00
salt.wei
a349193dad ENH: alow user to change jerk limitation
This is handle for github issue #1175

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I6e46245e274681502c118252e62ca9fd22a52135
2023-02-01 16:24:44 +08:00
qing.zhang
2705b5e4e6 ENH: updare end gcode and max_vol of TPU 95A
1 extrude move to dustbin
2 max vol of TPU 95A of X1 to 3.6

Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I0b9d2a1db9c57c58255f95aad8a77772317a3ec9
2023-02-01 16:24:44 +08:00
Stone Li
dc314bf404 FIX: fix bug of status for calibration finished
Change-Id: I774bbea8952340fc983162c10fca4b7ee444c725
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-01 16:24:44 +08:00
tao.jin
df96469918 FIX: title rescale and camerapopup button
Change-Id: Id9e9cec0a834f03d3918304265760d6a80ebf6fe
2023-02-01 16:24:44 +08:00
salt.wei
431eabd464 ENH: use gcode processer to get precise layer number
Using layer z to calculate total layer number is not
precision, because for some models with sharp top
layer, the top layer may be empty.

Check the final layer change in final gcode file.
This must be same with total layer number.

Jira: Studio-2123

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I5d001a8bb9548c3fb5f67fda966051ac3bb16502
2023-02-01 16:24:44 +08:00
gerrit
a36b7c3a9c ci: update network module based on commit d91b2d9
Change-Id: I710f94cb95a9158c26f0e6dbe2a9589d133eda2d
(cherry picked from commit 8d6ee467a83b2a85e7c5813274a73e6720889207)
2023-02-01 16:24:44 +08:00
Joshua Wise
ef4ee43bd4 Linux: MediaPlayCtrl: make playback more reliable with wxUSE_GSTREAMER_PLAYER for systems that have that 2023-02-01 16:24:44 +08:00
salt.wei
7dcb5c0e64 ENH: layer height 5.99999 should be same with 6.0
Merge numerically very close Z values when calculate
total layer number

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I4e60ca69fe5b06b66283d6a763d0b231c3d11b5a
2023-02-01 16:24:44 +08:00
lane.wei
7335f5d015 FIX: fix the crash issue when switch timelapse_mode or spiral mode
previous commit only fix the crash when switch spiral_mode
and will cause crash when switch timelapse_mode

Change-Id: If21acf3701e9519de55a08e183620678378f61b9
2023-02-01 16:24:44 +08:00
lane.wei
fd64c5f694 ENH: use Clear instead of Clean
Change-Id: Ia15a6d17404a76ddaab809cadc664a3a92ab4aa5
2023-02-01 16:24:44 +08:00
lane.wei
9a9113d3f7 FIX: fix a crash issue when setting spiral mode while wipe_tower disabled
wrong type used by boost::any_cast

Change-Id: Ic902c5775bc3cf1f22cb934c53b3ff4afa190e9f
2023-02-01 16:24:44 +08:00
Stone Li
b1fbdaf61c NEW: pass design info to PrintJob
Change-Id: Ic24462324b389e20647620366a5fe2b53bb4c1ce
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-01 16:24:44 +08:00
yifan.wu
d833ab1546 ENH: remove redundant log
Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: Id18e366e05ca49740b781ccb5e5f88af61debf56
(cherry picked from commit 269e617faa20f47b2e27e9c24376c7c9c04e0cd0)
2023-02-01 16:24:44 +08:00
Stone Li
7a0e0f9f55 FIX: fix blank filaments in French
Change-Id: I13395432d27a6a573a3ee357233b0623ba5a6ad7
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-01 16:24:44 +08:00
Stone Li
eb11c364e5 FIX: fix blank error msg of slicing warning
Change-Id: Idca57158b0139411a775a6b83cce2200694a5f2d
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-01 16:24:44 +08:00
tao wang
746d678df5 ENH:update description of humidity description
Change-Id: I1ae0d4aa9d2b43e4d41526e32e0df9260e8aa49b
2023-02-01 16:24:44 +08:00
tao wang
94e6734cc0 ENH:update ui layout for ip address dialog
Change-Id: I0095928e8c3951597d14783e1d4ef904946da993
2023-02-01 16:24:44 +08:00
tao wang
6948fb7546 FIX:fixed input ip dlg cant skip next step when playing liveview
Change-Id: I43c804babfc5e386f1218c9546acbf612d07703c
2023-02-01 16:24:44 +08:00
salt.wei
170a24a43f ENH: show travel time in gcode viewer
Seperate travel time from extrusion role time and
show it seperately.

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: Icf0aaf63c4d4ed7d1407037e5ae051d61938f973
2023-02-01 16:24:44 +08:00
qing.zhang
db873eb99b ENH: inner-out-inner wal seq
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: Idd2205f2b72a8f471927c9e3a38415013548f09e
2023-02-01 16:24:44 +08:00
tao wang
e144fce341 ENH:select vams when none ams mode
Change-Id: Id47e2e89d7b6661cb2f6b147f82bd699237396c9
2023-02-01 16:24:44 +08:00
tao wang
cf46b21003 ENH:C11 printer will not check ip and access code
Change-Id: Ib103ddb848a1ef835582b62c9de22ac17b9fa426
2023-02-01 16:24:44 +08:00
chunmao.guo
bea48a08d6 FIX: not play liveview when device is busy downloading
Change-Id: I48dc1c28fc78d69bfd37d1b531aa7daf5e6e4cbd
2023-02-01 16:24:44 +08:00
tao wang
faa918d872 ENH:update the title text of the enter ip address
Change-Id: I308b72cfa1dfcd138c3314f60db0556adae805dc
2023-02-01 16:24:44 +08:00
tao wang
9a8f832498 ENH:Update IP address input process
Change-Id: Iaf1c187dac117ba10ac16045049a346f7c2b9478
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-01 16:24:44 +08:00
zhimin.zeng
1015b7bca9 ENH: enhance the travel path of change filament
Change-Id: I720b833fc203f7ece63487e00290f4d91423c9f9
(cherry picked from commit 55e5fd8df1576d2b9252b2bd9e3e494db76218bf)
2023-02-01 16:24:44 +08:00
zhimin.zeng
de8b37b63c FIX: optimize the interaction of flushing volume dialog
Change-Id: I0ded28925b6e5d8be55d8f21577366fabb1170fb
(cherry picked from commit 1983304dd5d0f347df820f1ae3fd3c557670be1f)
2023-02-01 16:24:44 +08:00
zhimin.zeng
a52e423416 FIX: crush when slicer multi-color model
the root cause is a mismatch between the dimensions of flush matrix and the number of extruders

Change-Id: I3a4ca706cb24d9e5d33969b9e6f5b288e71bb8f2
(cherry picked from commit 7399037eaacdfd7d8407667a2e5a097757265254)
2023-02-01 16:24:44 +08:00
chunmao.guo
851cdad5f3 FIX: [STUDIO-1933] show ams filament as Generic type if id not found
Change-Id: I5ffd499ea16275479c6685dc6795ad240f59fa37
2023-02-01 16:24:44 +08:00
liz.li
110beef8e1 FIX:macos bitmap display problem
Change-Id: Id72ed155151fee4d1bcb6754fa5e6904bebcd98a
2023-02-01 16:24:44 +08:00
chunmao.guo
0add267611 FIX: [STUDIO-2065] icon action in ObjectList on macOS not work
Change-Id: I0b7d61a80afaeede3c7fb23afce9034a0b3bcaa6
2023-02-01 16:24:44 +08:00
salt.wei
9828101fa8 ENH: total layer number is wrong when enable support
This is fix for jira 2061

Layer height is double and may has small difference, which
influence total layer number when support is enabled.

Should use int data and consider EPSION when calculate total
layer number.

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I1bb6c89f2afd162d2d7e7dcff4a9d6a00b94dab3
2023-02-01 16:24:44 +08:00
四季奶青七分甜
b7b9029548 fix: Revert "ENH: avoid overhang area when set the seam position"
This reverts commit 1e95803df3733021e80241ecf7b88976708f0cf7.

Reason for revert: some model test not good, need to update curve function

Change-Id: I6afd6115d21198f60453d4f507905b6684a65cff
2023-02-01 16:24:44 +08:00
Stone Li
a3c34d0629 ENH: refine extrusion_cali_set command for factor k
fix enable status of confirm btn in ams settings dlg

Change-Id: I25c11078bb723647fac6370f966c74c807362e21
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-01 16:24:44 +08:00
zhimin.zeng
a91d043d67 FIX: The relative position is incorrect when loading part
Change-Id: Ie176d69631589e414048c61cfb3ca2128f8f9ead
(cherry picked from commit de33e37829b62579218d4c5f307104604dabbbc0)
2023-02-01 16:24:44 +08:00
zhimin.zeng
321785e82e FIX: wipe does not show when raft layers is not zero
Change-Id: I5c1cf1a3003aabd35b4a91073bc950fe772dbb00
(cherry picked from commit e3202e8bf2b40688ffc741cb9f1d87ec591a77f3)
2023-02-01 16:24:44 +08:00
tao.jin
b94271c750 ENH: refine backgroundcolor of warning dialog
Change-Id: Ia78f5da77913a30c6fe543cb9c2d4b5a78e696bb
2023-02-01 16:24:44 +08:00
Stone Li
a566715be2 FIX: fix print error tips
Change-Id: Iaf857e72f72d428ad3a361243818cdfcbb11a183
2023-02-01 16:24:44 +08:00
tao.jin
cb18a100ec FIX: UI fix on preference and project name
Change-Id: Iae83a4a25203479d24c4da9777498505b78745d2
2023-02-01 16:24:44 +08:00
salt.wei
4a3a4645f0 ENH: fix issue that sommetimes no wipe path is generated
This is handling for github issue #1072

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I253be46b07054eb69ddbad3889e31dfca57b2a52
2023-02-01 16:24:44 +08:00
tao wang
27fc88169e FIX:Fix UI display error without AMS mode
Change-Id: Ida20f405d6c5a99ba6a8c437a7201b8ebd7fbad2
2023-02-01 16:24:44 +08:00
Stone Li
b2a752110e FIX: fix display error in virtual tray
refine description for ams not connected

Change-Id: Ic4c01e69cfd9385548a497af5c5c3071614067a2
Signed-off-by: Stone Li <stone.li@bambulab.com>
(cherry picked from commit 4158f1e06ed20fa5dd4c3ef412d4c8fab76054a8)
2023-02-01 16:24:44 +08:00
qing.zhang
c56d0d8041 ENH:limit max nozzle diameter
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: Id87a83f1ad5d6d0033bd25eb456dd1204320ae80
2023-02-01 16:24:44 +08:00
Stone Li
d0d54db3e4 NEW: fix blank issue of error tips
Change-Id: Id4faa6d3edb7d8083000a6e752d059e25aab16a1
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-01 16:24:44 +08:00
Arthur
81ee7bb99b ENH: improve is_support_necessary
Use tree support to detect if there are sharp tails and so on.

Jira: STUDIO-1898

Change-Id: I148e14ca4024849875133a646a8fdd36c265b2fb
(cherry picked from commit bc74015d45e96e409d34d611876e3a24e289e029)
2023-02-01 16:24:44 +08:00
salt.wei
43ba4b0712 ENH: fix the issue about forcing cooling of pa-cf
For pa-cf, the default setting of cooling is
forcing cooling for all outer wall.

And internal tester found that the slowing down by
layer time does not work for outer wall under
this situation.

This is fix for this issue.

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I05aaa16d246f5ea6dc1ae9808050e1281646e184
2023-02-01 16:24:44 +08:00
Stone Li
3c44badd38 ENH: set timeout for starting extrusion to 20
Change-Id: Iae718e324170028121ca32e9653acac7b7b301f4
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-01 16:24:44 +08:00
tao wang
53ed1f99ce FIX:fixed print error has wrong layout
Change-Id: I668b32caeba9c3c2256c7a85b7858f98cd97fadc
2023-02-01 16:24:44 +08:00
tao wang
86490d4cef FIX:Fixed some UI layout issues for monitor page
Change-Id: I91fc50b63ff79ef7e9b7df600325a619c6764a09
2023-02-01 16:24:44 +08:00
Stone Li
d25f7535a9 ENH: add tips for P1P when printing all is not supported
Change-Id: I5caa5dbc2d9cd3c57318a2366c8a8ef494d4df31
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-01 16:24:44 +08:00
tao wang
2b35478e12 ENH:Allow clicking to confirm button when the data is complete
Change-Id: If28f20e6ce1fac783533cbc595614a909386dfae
2023-02-01 16:24:44 +08:00
tao wang
23fb4dba2e ENH:select the first tray when switching AMS
Change-Id: I74487f9bda81df199685b31e6fb7f5dbcaeef607
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-01 16:24:44 +08:00
liz.li
8a3b39345e ENH: adjust ExtrusionCalibration image related
Change-Id: Icca866dc5a164dee7da420f2fc04976bcfb42d04
2023-02-01 16:24:44 +08:00
Stone Li
07282cc078 FIX: fix code conflict
Change-Id: Ibffa0b4fc4c72df878b469ab50f74d12748f15ed
2023-02-01 16:24:44 +08:00
tao wang
739915e6f6 ENH:Optimize the layout of AMScontrol
Change-Id: Id74c0f14cf17b5d0cbc1077bb3609d7b1c8c6c2b
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-01 16:24:44 +08:00
Arthur
5cc08e3398 FIX: tree support first layer defects
Tree support didn't fill the first layer when the tree is too short

udesk: 0284
Change-Id: I2702b26733e7360445e19847abb48f75f173da4e
(cherry picked from commit e317f9e19fbbfe21efb495e23a8ff78661bfee79)
2023-02-01 16:24:44 +08:00
tao wang
6e41067bbb ENH:show default ip address and access code when user enter
Change-Id: Idbe3af1fd13dfe34634b5c7fa2f7ca8791b3e10a
2023-02-01 16:24:44 +08:00
tao wang
8ab190da48 ENH:add total layer/current layer UI
Change-Id: Ib0ceae161280258d9a9fbf6fb46d34810f24c57a
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-01 16:24:44 +08:00
Stone Li
67d4e2148f FIX: fix sending gcode to octoprint
Change-Id: Id541b18d8e3522854d83f57dd4f3b02863a6aae7
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-01 16:24:44 +08:00
Stone Li
32afff46fc NEW: support language of japanese
update po files for BambuStudio

Change-Id: I6783fe831d05a19eb7fce6f8b24ee7949d1ed86b
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-01 16:24:44 +08:00
Arthur
fa9a530184 FIX: raft density in tree support was wrong
Jira: STUDIO-2005
Change-Id: Ic2e9a3824ea943f101737270382c63cfaea656a1
(cherry picked from commit e10e17863a40638329ff43c8fa12b88c79e7b76b)
2023-02-01 16:24:44 +08:00
Stone Li
f701b4efd5 FIX: fix check k / n logic
Change-Id: I0f9fe5c95523d79b4c6435555d10f2d641639b13
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-01 16:24:44 +08:00
salt.wei
21485dec6a ENH: add some new filament
Bambu PLA tough, Bambu PLA Marble, Bambu PLA Sparkle

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: Ib882485d9bdf6a29b8f5c8681e2d7bda8c7e1da0
2023-02-01 16:24:44 +08:00
tao wang
8d2f3c8440 FIX:Fixed some UI layout issues for monitor page
Change-Id: Ifbb7dd7271195bed17dcd83a398bb7a65b13dca2
2023-02-01 16:24:44 +08:00
chunmao.guo
143f9cfe99 ENH: request lan ip if liveview failed with lan tunnel (2)
Change-Id: Ie40c31b8c3600dc30228d931013cc0e12a6b1a78
2023-02-01 16:24:44 +08:00
chunmao.guo
f28c9198a7 ENH: request lan ip if liveview failed with lan tunnel
Change-Id: Ib987ce684873869e5abc71da9bad8600479c7146
2023-02-01 16:24:44 +08:00
Stone Li
f7175a3e14 ENH: refine entries for extrusion calibration
Change-Id: Idcefca17cb026887ea5bd32387ab6d269f8f9d58
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-01 16:24:44 +08:00
Stone Li
eed072eccf NEW: add extrusion calibration
1. display factor of extrusion calibration
2. add progress to calibration extrusion
3. support ext spool

Change-Id: Ic124a0097f16e6287c09f5f133eea84eeefb4000
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-01 16:24:44 +08:00
salt.wei
582ec2c109 ENH: for issue that initial layer temp doesn't work
Start gcode of P1P is wrong.

This is for github issue #1044

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: Id078b7c9020ef773373c3486f74dc51385b9dcc0
2023-02-01 16:24:44 +08:00
Stone Li
5861cbc30a ENH: refine max/min/close button position in BBLTopbar
Change-Id: Idb86daf195df856e24c32363e763e38d77f39744
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-01 16:24:44 +08:00
tao wang
e962bcfec9 ENH:add ams humidity tips and update new icon
Change-Id: I8f504fa911ef7a84ca8929af3c5d7c53d289761e
2023-02-01 16:24:44 +08:00
tao wang
7de62693c7 ENH:enter access code with ip address when lan mode connect
Change-Id: I987f953bad20d8ddea299226eb6f49a157fc7be4
2023-02-01 16:24:44 +08:00
Arthur
18366df5d0 ENH: only allow setting height when cut plane is horizontal
Jira: STUDIO-1819
Change-Id: I04d258949cbf98a59f7313d714430f361bb2c4a9
(cherry picked from commit 2ffa8430b819cfffe20f4c7734125a3aabd33202)
2023-02-01 16:24:44 +08:00
Arthur
2800c97165 ENH: add gcode command for void printing detection
1. add gcode command for void printing detection
2. fix the issue that the toolhead is not at excess chute position when
  smooth timelapse ends, by adding 2s pause after M991 command.
  Jira: STUDIO-1996

Change-Id: I40cf16116e742744cea9bd90969e556a9ea2b2f1
(cherry picked from commit 2fbf7ffe6b1bd8850a76e229ff91750c689721b9)
2023-02-01 16:24:44 +08:00
Heiko Liebscher
8244693b55 Fix po and pot file (#258)
* fix typo and tooltip

* merge pot po german

* fix more

* merge with bambu master pot

* fix po to Softfever

* fix

* build new Softfever pot mege with xx.po

* enable hints in german again
2023-01-31 22:34:49 +08:00
Heiko Liebscher
887833e535 bambulab fix 69b884e (#265) 2023-01-31 21:37:19 +08:00
lane.wei
b2caf90498 Revert "ENH: add the linux build action to github"
This reverts commit c0791f0fdd.

wrongly pushed to master
2023-01-31 21:27:35 +08:00
lane.wei
c0791f0fdd ENH: add the linux build action to github 2023-01-31 21:13:42 +08:00
SoftFever
5a42590d73 fix crashing issue when the model's path has Unicode characters on third party printers. 2023-01-29 15:45:21 +08:00
SoftFever
36f4d585bf hotfix: fix PA calibration issues (#253)
* Fix PA dlg DPI issue

Signed-off-by: SoftFever <softfeverever@gmail.com>

* fix PA tower issue

Signed-off-by: SoftFever <softfeverever@gmail.com>

* fix locale issue for non English OS

Signed-off-by: SoftFever <softfeverever@gmail.com>

* bump to 1.4.4

Signed-off-by: SoftFever <softfeverever@gmail.com>

* update mac x64 ci/cd

Signed-off-by: SoftFever <softfeverever@gmail.com>

---------

Signed-off-by: SoftFever <softfeverever@gmail.com>
2023-01-29 00:17:25 +08:00
Heiko Liebscher
68def3cbb0 fix typo pressure adv and german languge (#252)
* fix typo pressure adv and german languge

* typo

* type advnce

* fix typo and msg id
2023-01-28 21:10:57 +08:00
lane.wei
8a81df98b5 ENH: add the liveview support of P1P
P1P uses Mjpeg instead of h264

Change-Id: I41c8a6b7c13ed027350939bea3d9cb74757c0b63
2023-01-28 16:18:05 +08:00
SoftFever
9b3ed8e4e6 fix crashes when switch timelapse and vase mode
Signed-off-by: SoftFever <softfeverever@gmail.com>
2023-01-28 16:14:15 +08:00
lane.wei
7e9ccefcaa FIX: boost: fix the patch failed issue of boost
Change-Id: I6f689cd6dc08964cb759d09798b2bbe64c7aae85
2023-01-17 19:37:56 +08:00
Joshua Wise
730aa890c3 wxMediaCtrl2: provide a better error message if the system does not have h.264 codecs installed 2023-01-12 14:56:04 +08:00
Joshua Wise
745076805e gstbambusrc: improve compatibility with older GStreamer versions 2023-01-12 14:56:04 +08:00
Joshua Wise
43a7f88c6c Add support for Bambu Lab X1 series live video stream on Linux.
wxWidgets on Linux uses GStreamer as its back-end for wxMediaCtrl, which
doesn't have a bambu: URI handler.  On Windows, this is handled by a Windows
Media subsystem plugin, and on Mac, this is handled with a BambuPlayer
class.  Luckily, the libBambuSource.so binary that is distributed with the
network plugin package already contains support for receiving h.264 data
from the network, and the API is the same as is used by the tiny
bambusource.exe binary on Windows; we glue this into a GStreamer source
plugin that registers a URI handler for bambu:.

To make this work, we make a few additional changes elsewhere.  GStreamer
seems to have trouble rendering an Xv overlay onto a 32bpp X visual, but
Bambu Slicer seems to request a 32bpp visual for some background
transparency in the Notebook; it doesn't seem to use it in an interesting
way on Linux, though, so we remove that request for transparency to allow
Bambu Studio to render to a 24bpp visual.  The media controller
infrastructure also makes a few assumptions about when sizing information
can be queried from a wxMediaCtrl backend that do not hold true on Linux; we
either fix those assumptions, or fake them out, as needed.  We also make a
few changes needed to successfully compile C.

This has only been tested with the GStreamer backend for wxWidgets --
notably, not the GStreamer-play backend (these are, astonishingly, two
different things!).  If you find that this seems not to work, consider
*un*installing the libgstreamer-plugins-bad1.0-dev package and then
rebuilding wxWidgets.
2023-01-12 14:56:04 +08:00
Joshua Wise
89d38fc6f6 deps/wxWidgets: avoid patching too many times
Each time the dependency build was run, previously, the build system
attempted to patch wxWidgets after checking it out from Git.  The problem,
of course, is that if this happened once, it would not succeed a second
time, so the only workaround was to blow away the wxWidgets source tree.

The real solution to this is to create a BBL fork of wxWidgets (or to
upstream the changes...).  But for now, we add a file to determine whether
the patch has taken place already, and if it's there, we don't apply the
patch again.  This will mean that all kinds of exciting things happen if you
change Git revisions of wxWidgets or the patch changes (in those cases,
you'll have to blow away the build), but at least this makes it possible to
build twice in the same repository in the best case.

To update an existing checkout, run:

  $ touch deps/build/dep_wxWidgets-prefix/src/dep_wxWidgets/WXWIDGETS_PATCHED
2023-01-12 14:23:37 +08:00
Joshua Wise
fe13ca0b52 Linux: update GLEW to 2.2.0, and enable EGL support in GLEW to match wxWidgets
On Linux, wxGTK by default attempts to use EGL if it is available on the
system, rather than GLX.  Unfortunately, the ancient version of GLEW that we
packaged in did not support EGL, and even if it did, the configuration was
not set up to enable EGL.  To solve this, we:

  * upgrade GLEW to version 2.2.0, from upstream GitHub

  * modify the Bambu build process to enforce that we use GLEW from the
    built dependency

  * remove the "extra" even older GLEW that was packaged

  * modify GLEW's CMake configuration to enable EGL support when it is
    available on the system (using the same test as wxWidgets uses to decide
    whether to enable EGL support); if EGL isn't available at compile time,
    both GLEW and wxWidgets will fall back on GLX

Note that you probably will have to blow away your CMakeCache for this to
work correctly -- otherwise, you may end up with the system GLEW, if you
have one installed (which is probably not what you want -- on Ubuntu, the
system GLEW is GLX, not EGL).
2023-01-12 12:29:59 +08:00
liz.li
fdba5967fa ENH:optimize method of gcodeviewer marker get current move
Change-Id: I935d8da52212156b4158d727b49d8b0e51105fa3
(cherry picked from commit 4826570649608691184c05260edf4c074dccb780)
2023-01-10 19:08:26 +08:00
salt.wei
70a0f09ea2 ENH: disable clipper2 in perimeter generator
Clipper2 doesn't solve wrong line issue for some
specific model and sometimes has performance issue.

Return to clipper1.

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I906f8b81083ac8c03ecc9fe3e8d2ade20be95c04
2023-01-10 19:08:26 +08:00
salt.wei
ba064d44a1 fix: revert "ENH: aligned the z-seam"
This reverts commit 2d0805d4aabbc4e8f25aa93c8f01870c256a0b17.
2023-01-10 19:08:26 +08:00
salt.wei
b13928b615 fix: revert "FIX: fix the out range of array of seam algining"
This reverts commit f100c10fa8aa0460d3ff11723c6a2504b6b69bba.

Change-Id: Ice36f6f41d5a50a7244d8f09960876d9539802d8
2023-01-10 19:08:26 +08:00
liz.li
b27a9e27ce ENH: preview slider behavior
1.add pauseprint will not cause preview page refresh
2.fix add custom Gcode window and jump to layer window cannot input after reslice

Change-Id: I4f75457b6d6172080715393c975169c8f16464b9
2023-01-10 19:08:26 +08:00
salt.wei
3d48e2dc55 ENH: sync some change in gcode viewer
Improve the loading speed of gcode preview

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I9cf4b32f10753e1bc1d9b109557b995d5f3fd549
2023-01-10 19:08:26 +08:00
salt.wei
3291a452da ENH: global_endpoints should not include seam
This is fix for jira STUDIO-1501

Global_endpoints should not include seam vertex.
So the initial value should be gcode_ids.size(),
rather than m_move_vertex

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: Id4162e63640509521cc7c76bc0d860f27e0c316e
2023-01-10 19:08:26 +08:00
salt.wei
534dcf11c1 ENH: remove bed temperature check
This is useless now. Remove.

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: Id9a5e7822b19a74bf35670d5913214467b5a90ac
2023-01-10 19:08:26 +08:00
qing.zhang
d42d6bec87 FIX: fix the out range of array of seam algining
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I655e7a0a5cdac6c05ddd8a6c7f38e1f97a7d0f96
2023-01-10 19:08:26 +08:00
liz.li
bae334a77e FIX: Preview page : change menu window to modal window
1.by right-click on slider, multiple menu-windows can be opened at the same time
solution: change opened window to modal window.
2.close opened menu window after reslice

Change-Id: I4973e1cf4c2ecce83602417be051d249f1aae6a4
(cherry picked from commit 8890f1b3bdf8f1374136ec40e3f44de583c71e7f)
2023-01-10 19:08:26 +08:00
tao wang
d38fd70c2e ENH:change to generic ip address enter dialog
Change-Id: I4d3b4f091e435d600216ef8ec44d04ca7c90a26d
(cherry picked from commit 5796a72a567ee1a2b3dee7508832d9e0d6348820)
2023-01-10 19:08:26 +08:00
chunmao.guo
ea664b6e13 FIX: cannot change filament
Change-Id: Iccc37a3005dd0aaa7e9ff8720390924abf65d4d1
2023-01-10 19:08:26 +08:00
chunmao.guo
ae959b7400 ENH: [STUDIO-1871] merge changes of user presets from other sessions
Change-Id: I2841ff4e23b18ebe7cdf374b69a494a4c05a49ee
2023-01-10 19:08:26 +08:00
tao wang
e71b5a88b7 ENH:Hide the cancel button after sending successfully
Change-Id: I4ebd620b443c22dd7f81113274d68c7f11dd62d6
2023-01-10 19:08:26 +08:00
tao wang
48ceca536b FIX:dynamically update layout when options are changed
Change-Id: I57633604428e42f4a67dfcfd80336ab33767e099
2023-01-10 19:08:26 +08:00
zhimin.zeng
3651d4ec15 FIX:uniform scale can't be deselected when selecting multiple objects
Change-Id: I4e9c18410ffe45d9db9743c5e0f9c90019c372a2
(cherry picked from commit 9c669cacfce6d23a69993f36e6aebb982fb6ee3b)
2023-01-10 19:08:26 +08:00
zhimin.zeng
49673b56e3 FIX: the text position is not correct
Change-Id: Icade50bd8246d051f6c8368f2be89654cb96c9d9
(cherry picked from commit a39d7ffb377c53aa85264e8196e47b176479544a)
2023-01-10 19:08:26 +08:00
chunmao.guo
a4cf284c3d ENH: adjust user preset handling
1. async fetch user presets from server (in thread)
2. always load default user presets
3. load user presets from cache immediately
4. not remove user presets cache
5. hide some loading ui

Change-Id: I1d29ed18e09606d0b2f69a69eea2eb5042c26223
2023-01-10 19:08:26 +08:00
liz.li
dbb5ec9115 FIX:layer time(log) display problem
Change-Id: I86cef0971f6d835b15828e4e9f168fcdacbfb302
2023-01-10 19:08:26 +08:00
chunmao.guo
722fde9255 FIX: [STUDIO-1873] scroll out of range in DropDown
Change-Id: Ide38f2e34f8b54380e72dc51509050c55b771f6d
2023-01-10 19:08:26 +08:00
chunmao.guo
3372313e13 FIX: [STUDIO-1969] disable mouse wheel on SpinCtrl
Change-Id: I9d568c5fe48defe88c94a476a295143c7089d960
2023-01-10 19:08:26 +08:00
chunmao.guo
3ee83cd3db FIX: [STUDIO-1752] remove background of tips_arrow
Change-Id: I5634e33ea320fc8e5fe9cc9d2b641e4598ce133d
2023-01-10 19:08:26 +08:00
Stone Li
41d08e0924 FIX: fix display error in UpgradePanel
Change-Id: I1be4a8879baa6a43ebd8d69eeb95cc83d53bc16d
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-01-10 19:08:26 +08:00
lane.wei
38705f87a9 FIX: fix the gap_fill not take effect
when using new render logic
the area is calculated with error

Change-Id: Ia0ac1cb6c46c0e312b704d27c8ccc0ca6ac5f8ec
2023-01-10 19:08:26 +08:00
qing.zhang
ad6257ca84 ENH: aligned the z-seam
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I60e1a046fb236d588a5e83b602fabd39580228fb
2023-01-10 19:08:26 +08:00
qing.zhang
3a6f033794 ENH: avoid overhang area when set the seam position
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I58eb8c091b68b8c64f44d21db88d2f9155e42e42
2023-01-10 19:08:26 +08:00
lane.wei
38406e3e59 FIX: fix the object select state not correct issue when load project from drop-files
Change-Id: I6ad11ec3a96d73ac38f2f5aab74a3fcd685c0a34
2023-01-10 19:08:26 +08:00
lane.wei
0dc7f51782 FIX: fix the crash issue when right-click on object list in preview
Change-Id: I31fc987b762fe2718b4ca1659d14864e44a86225
2023-01-10 19:08:26 +08:00
lane.wei
859aef4c4e ENH: copyright: change the copyrights to lunkuo
Change-Id: Ie2804275a422a1314a5f948fc35cfc5bb7a31e29
2023-01-10 19:08:26 +08:00
lane.wei
0ddd7ed5e7 FIX: fix the country code not correct issue under pre environment
Change-Id: I5fa3f20949b3f50304d42a50b3819cc5e04c0656
2023-01-10 19:08:26 +08:00
tao wang
b3575b47d1 ENH:optimize the popup position of the fan control dialog
Change-Id: I98212c2860dfec955072c82710c8dee31866fd1d
2023-01-10 19:08:26 +08:00
tao wang
7b0bfa8229 FIX:fixed C11 printer not showing humidity
Change-Id: Ie1c3ddf66772ff0799ebed0827c7b23e23e17742
2023-01-10 19:08:26 +08:00
tao.jin
f0bfbc617a FIX: position of video setting popup
Change-Id: I1e8053f9081b82785a99faad40adf13f756ad5ff
2023-01-10 19:08:26 +08:00
tao.jin
b52c27710b ENH: refine text display of ams setting dialog
Change-Id: I180cb755d4a52d83f2916f5f4de3acc3cc21866f
2023-01-10 19:08:26 +08:00
tao.jin
1cbaa6e312 FIX: refine shortcuts on collapse/expand sidebar
Change-Id: I2332617e69ee73edeaabb5b6fd7a225ac073b76e
2023-01-10 19:08:26 +08:00
tao.jin
67862ec21c FIX: calibration dialog text display
Change-Id: I4dd6e83721e646b165f50501902488bfcff3de93
2023-01-10 19:08:26 +08:00
tao.jin
db94a8dbba ENH: refine vcamera guide link
Change-Id: Ia94b7c5da9ed6a45c542dac177d0ea2b262c2d95
2023-01-10 19:08:26 +08:00
Arthur
d16dee04af ENH: [tree support] use layer_nr_next for calculate_avoidance
Previously we used layer_nr-1 as the next support layer below layer_nr,
which was not right when we used independent support layer heights.
And this would make it difficult for the tree branche to avoid the object.

Change-Id: Ic705fbd093e4bd555470646044380703ca259904
(cherry picked from commit 245e1cf4fd071b1f1fea4c5d616ff87432a76911)
2023-01-10 19:08:26 +08:00
salt.wei
de6ba75f40 ENH: add layer progress into gcode file
As title

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I7b083e15e0f9030d7822494c4d6fc9cc72335ec2
2023-01-10 19:08:26 +08:00
SoftFever
357fa2bfe1 refactor and improve layer time display 2023-01-10 19:08:26 +08:00
SoftFever
f42ae3239e Add Layer Time/Layer time(Log).
Main logic is ported from SuperSlicer

Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>
2023-01-10 19:08:26 +08:00
chunmao.guo
dfc1eec49b FIX: patch boost limit_handles
Change-Id: Id155b1c23e19b4cbf7c4bea18ce138511d5f2b8f
2023-01-10 19:08:26 +08:00
gerrit
f8d0fc374f ci: update network module based on commit 8836418
Change-Id: I765e67382a07ef14171ec14e51b47b036683a7c5
2023-01-10 19:08:26 +08:00
tao wang
f54e2d2a00 ENH:optimize the save presets dialog
Change-Id: I7cd954d27db96a461e4e6b8a10c904dbb892b002
2023-01-10 19:08:26 +08:00
tao wang
4d8d4cb69c ENH:wxStaticText set the default foreground colour
Change-Id: Ifb03554848bc869f8605fb10945e7681147204d5
2023-01-10 19:08:26 +08:00
tao wang
64a635608c ENH:set the fan gear at 10%
Change-Id: I4ccb62c0e047ccaec3b6a7ca02e03fd2ce320348
2023-01-10 19:08:26 +08:00
tao wang
5dcf49e0f4 FIX:hide the rpm for fan speed
Change-Id: I4ba972ee358cbb833a704b927260325940ca4d53
2023-01-10 19:08:26 +08:00
tao wang
a6254c44fd FIX:set popup position change to move popup
Change-Id: I3417416dc6de4a40674f1ac98c4ba4fa593f3297
2023-01-10 19:08:26 +08:00
tao wang
c2978c05a9 FIX:auto-calc button has wrong background
Change-Id: I2d295dbfb1c8f50c2ce28fa0cff69b10926c55bb
2023-01-10 19:08:26 +08:00
zhimin.zeng
33002f8ae5 FIX: crash when delete volume in assemble view
Change-Id: I72d864a7580165ef6b079e97c2ec30e288152e62
(cherry picked from commit 8b06fe17e0a894c48a083a2a76fe69ea348a5d7a)
2023-01-10 19:08:26 +08:00
salt.wei
fca338582b ENH: add raft contact distance
For github issue #975

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I3b2c4f105374fccf4fb0cdbfba5bb6181da6dd93
2023-01-10 19:08:26 +08:00
chunmao.guo
5066cc1736 FIX: label color
Change-Id: I1de550178601fab8844fac9aabf9728233a965bb
2023-01-10 19:08:26 +08:00
Stone Li
9bc46daf40 ENH: optimize the copy description format
remove "\n" from _L macro

Change-Id: If1beda4a77f1c2b42945657b7386e155b8bc7a20
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-01-10 19:08:26 +08:00
chunmao.guo
2da79a3ff0 FIX: [STUDIO-1754] use boost limit_handles on posix platform
Change-Id: I074373eccefaec16cb163c5b645d169c258c0253
2023-01-10 19:08:26 +08:00
chunmao.guo
1786ad26ca FIX: [STUDIO-1800] enable_user_preset_folder before load preset
Change-Id: I1101cca75a82f73393d6565fc0a4740756011b8b
(cherry picked from commit 06cf2b750aa42327ed8c57584ed90c0ff241068c)
2023-01-10 19:08:26 +08:00
chunmao.guo
41f5fabc2e FIX: open media play 2 seconds later when switch device
Change-Id: I58d0cdc7581c7d0ef8b9081d1909b6d813406dd8
2023-01-10 19:08:26 +08:00
chunmao.guo
aa880e34a7 ENH: detect printer uses ssl for local connection
Change-Id: I6131bf5ed1f6d44f0bd761ad6bc3a492ba4945b7
(cherry picked from commit c68d48ecf290e5abd37a97654c5b1f7779f061e2)
2023-01-10 19:08:26 +08:00
liz.li
5fc3694e08 NEW:add hide function in assemble_view menu
1.support hide funtion in assemble view
2.fix an issue that switch printable in assemble view will make
model-in-assemble-view turn transparent instead of model-in-view3D
3.fix a crash: right-click on objectlist after entering assemble view

Change-Id: Ia1a7ca492637eeaacd862ba015c440a55a83ca6e
2023-01-10 19:08:26 +08:00
liz.li
674348c575 ENH: support single-sided modal scaling
Change-Id: I746cfbb53d761abe2e7bf7cad391f9a37d821b3d
2023-01-10 19:08:26 +08:00
salt.wei
ebaae57b01 ENH: disable slow down for overhang when fuzzy skin is used
When fuzzy skin is used, it's unmeaning to calculate
the overhang degree of extrusion line, because there
are a lot of random fuzzy point which change the line.

Disable in this case. This can also speed slicing up
when fuzzy skin is used.

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: Ia65e20e24fd7a5cd224635fd69a272387135ba12
2023-01-10 19:08:26 +08:00
wintergua
49eb40b711 FIX: brim croping in mulit-plate case
Brim will be croped to ensure it does not exceed the bed area. However,
plate offsets are not considered and thus the croping does not work in
multi-plate cases. This can be fixed by this patch.

Change-Id: Iffcce6cba23a82de1fdd9fffe8c48c4e303e9e15
(cherry picked from commit 9c53fb12153cc8a31448ae4a670171c495243dae)
2023-01-10 19:08:26 +08:00
lane.wei
57a57fc429 FIX: bed_type: fix the bed_type issue when already set in plate
Change-Id: Ieb9c432051aeaf1dbb94c75f95974ff41c0713a0
(cherry picked from commit 73de2ea2cfcfa6b09373f4faa2d84f0b6e2f4ffc)
2023-01-10 19:08:26 +08:00
chunmao.guo
d164889aa4 ENH: [STUDIO-1647] use WebView2 put_UserAgent
Change-Id: Ifae6589892353adb4b940fbe77d7d0f9521330dc
2023-01-10 19:08:26 +08:00
chunmao.guo
a953442c9e ENH: update WebView2 to 1.0.1418.22
Change-Id: I76d4747f8e135368e9dae6ee9f3e980bf4ec6f81
2023-01-10 19:08:26 +08:00
salt.wei
4b63bf453c ENH: fix z hop error issue
This is fix for z hop issue that z hop of
layer change is always spiral list even when set
to normal lift

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I7b235a640b0538bedfe4cef61ca24108c1ba7246
2023-01-10 19:08:26 +08:00
tao wang
c4136f7641 ENH:reset filament empty when the remain value is error
Change-Id: I1fa1923a7ef3cd61b592e5ff0874aadf5a534eaf
2023-01-10 19:08:26 +08:00
yifan.wu
5d9bb61f8e ENH: use spiral lift only when it is needed
If a travel path goes through an overhang expolygons, and their distance
is shorter than threshold, lift type will be set to SpiralLift.

Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: I345788711755dd8611ecf385818e6052cd8abe9e
2023-01-10 19:08:26 +08:00
tao wang
47a46010bd ENH:allows the user to enter a printed IP address
Change-Id: I9d2617d0dd42f53e93d61e98bcf3cc97979a93f6
(cherry picked from commit 24ab56f8568e9637634e97a0632309cfd2762749)
2023-01-10 19:08:26 +08:00
tao wang
c8df45c11f FIX:fixed some models with special names cannot be downloaded
Change-Id: Id5a3dff960d6e9868dfa87aef96093de2dc215e6
2023-01-10 19:08:26 +08:00
chunmao.guo
301d06dab4 FIX: [STUDIO-1770] webview white background
Change-Id: Ie828f53139978b0f7745355e7c65c7f6067dd4d3
2023-01-10 19:08:26 +08:00
liz.li
3190283929 FIX: fix problems of preview-slider under ByObject
1.layer number display in disorder under ByObject case
2.disable unworkable functions in ByObject case:add pause, add custom Gcode, change filaments

Change-Id: Ib0413e047db1daf1ca582e1369c70b6b93c1bd64
2023-01-10 19:08:26 +08:00
liz.li
c832a03616 FIX: toolbar cannot rescale a super small stl correctly
1.reason: input box limit the digit of input number, and has a max value limit of scale

Change-Id: Ib6f36033ebc9d1621eb0c3359c67ff788518f528
2023-01-10 19:08:26 +08:00
liz.li
5f5ffc8376 FIX: wxGDIFont exception when init
Change-Id: Ib245e89e2e8644c662d7621101777a5d8e15c7d9
2023-01-10 19:08:26 +08:00
Stone Li
a163d4fa02 NEW: add build time in about dialog
Change-Id: Ibb27223568f19f39ec57c01af23376c325d3972b
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-01-10 19:08:26 +08:00
zhimin.zeng
93b1a335d2 ENH: allow generate wipe tower when print ByObject
allow generate wipe tower when print ByObject if there is only one object

Change-Id: I199e9cab7bd7c963edf58e829c663bb91c12f4f8
(cherry picked from commit 7153c30800022f3afb9811c67f88ba28c9b25d20)
2023-01-10 19:08:26 +08:00
zhimin.zeng
1c5c9bd3d2 ENH: support text modify
Change-Id: Ide5a3c7df5f3ea4395821a65807d79b459f3e46e
(cherry picked from commit 55de44d4c80c545de14466aa039a7b0ac144f395)
2023-01-10 19:08:26 +08:00
zhimin.zeng
e70253cf25 FIX: can not save project when modify bed type in the scene
Change-Id: Iaea1bef142edcf0c68a64cfa1f3b1d309b96f251
2023-01-10 19:08:26 +08:00
lane.wei
8183b7d333 ENH: debug: when not release to public, use vectored exception handler
Change-Id: I2f80f07e035d6a6652574470ac13631baba7cf7d
2023-01-10 19:08:26 +08:00
tao.jin
c75ca06f01 ENH: render mesh_errors notification in red
Change-Id: Ie13524dc27436b9e1c075e5e9e0363cfa1504147
2023-01-10 19:08:26 +08:00
lane.wei
88ecb2aa2e ENH: save hints.cereal into user directory insteadof cache
Change-Id: Ie44f18768e9908946f173bc668a46eb723f19745
2023-01-10 19:08:26 +08:00
lane.wei
f0908f2a63 FIX: repair: fix the state not correct issue after repair
Change-Id: Ic4aaeaeeee921294e0a5ab6d82517dc28f8822c8
2023-01-10 19:08:26 +08:00
zorro.zhang
54aae68874 FIX: optimize text display
Change-Id: I4e44e12786a1af34cca35edb3c32d9f500b933ed
2023-01-10 19:08:26 +08:00
qing.zhang
9fcb67e6c7 FIX: add plate offset of placeholder
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: Id16559e112b6db2759b95f97465d49ab85206e83
2023-01-10 19:08:26 +08:00
Arthur
646b259972 ENH: merge tree support layers to support layers
Will greately reduce repeated codes.

Change-Id: I506a97a907b5b393fe41e13ae53e2f7c9247c4c5
2023-01-10 19:08:26 +08:00
tao.jin
b6ef31f7b9 ENH: refine physical printer dialog
Change-Id: I34d122f83addab3db2952a6a2b91b59921d2a981
2023-01-10 19:08:26 +08:00
Stone Li
f89dfa7615 ENH: modify slice button and print button initial value
Change-Id: I114aa63b25f32ba6b427afd8b9ce4ebebfe18915
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-01-10 19:08:26 +08:00
qing.zhang
c4ec0ddae9 ENH: put the seam on invisible line of modifier
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: Ib16de93b26e96902ce2e0d844b78d0cc680638a4
2023-01-10 19:08:26 +08:00
chunmao.guo
ff49a854b2 FIX: [STUDIO-1653] login dialog position
Change-Id: Ib73195d55c8bec3e8d5eec4b56489a5c22882de9
2023-01-10 19:08:26 +08:00
Arthur
9dd1cabef6 ENH: translate support setting suggestions
Change-Id: Iabaf85589cd99d3364edeb4c3f2847156657e05a
2023-01-10 19:08:26 +08:00
chunmao.guo
6763968461 FIX: [STUDIO-1575] end dialog with wxID_ABORT on user end session
Change-Id: Ie509b5780a5d11572eadd6dee2fd93903c128c17
2023-01-10 19:08:26 +08:00
zhimin.zeng
a6e3d63576 FIX: a part with new color change to negative part
even though there is only one color, the wipe tower is still exist

Change-Id: I5c68a4ca7239cfc74aba452a6588d74f6d622f47
(cherry picked from commit 032c2e6718c65aa4c5b18eecd0ccce27f3f489bb)
2023-01-10 19:08:26 +08:00
chunmao.guo
1d04c35d0d FIX: StaticBox zero size bitmap
Change-Id: I33d942f771171fe1f2a61b5f3d1a66a6c7e0da05
2023-01-10 19:08:26 +08:00
chunmao.guo
99b97ffeb4 FIX: [STUDIO-1842] format wiki url's anchor
Change-Id: Ifb8f73a1674aecaaad5ef5e7248a142e8a0f0146
2023-01-10 19:08:26 +08:00
Arthur
38ce4b94f4 ENH: improve sharp tail detection
1. When sharp tail region suddenly grows a lot, it means it connects to
   a well supported region and is no longer a sharp tail.
   Jira: STUDIO-1862
2. First layer of sharp tail can not be reducible (must have extrusion,
   i.e. won't disappear after slicing), otherwise thin spikes at the
   top of the object are also treated as sharp tails.
   Model: knight_seadra
3. Increase sharp_tail_max_support_height to 16mm
   Model: Crane_reversed

Jira: STUDIO-1859 (for this issue I don't what is the exact cause,
   but adding these three improvements solves the problem)

Change-Id: I3cd57b184d78dba8862ab3c214057ae78fe49d1f
(cherry picked from commit 9242c6a6d1f23f11ebc43a9049ce10229a15c60e)
2023-01-10 19:08:26 +08:00
zhimin.zeng
4284d2ddb0 ENH: generate wipe tower when custom change gcode filament
Change-Id: Ia0c81453f09457a9d1d56fbcdce79112953c0208
2023-01-10 19:08:26 +08:00
zhimin.zeng
75c5d7b267 FIX: the position is reset when reload from disk
Change-Id: I1acf9501f7211b45655c86dac7a529681f8cf150
(cherry picked from commit 1b7c763673e37f33ceea59be96cfb29760721f6b)
2023-01-10 19:08:26 +08:00
salt.wei
030d97bf78 ENH: optimize area of top surface
Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: Ia3d1be6ad3b9f55ee1acda14d0be955055f6dfcb
(cherry picked from commit 448fd3043950613a4d91df256fa9ee52a57fcaca)
2023-01-10 19:08:26 +08:00
salt.wei
9f4a54d280 ENH: don't generate detour travel when position is unclear
Detour travel is wrong in multi color printing when
current position is unclear.

Don't generate detour travel in this case to avoid
colour mixture.

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I2d24b04d99b8a0b34a46c9f88e522e97cb0fe354
2023-01-10 19:08:26 +08:00
tao wang
12590a3599 FIX:fixed title of calibration dialog not being darked up
Change-Id: I3c24dde3ba3effb815b744aef16da273ad78b55a
2023-01-10 19:08:26 +08:00
tao wang
49f3f3571d FIX:fixed object table Brim does not take effect after setting
Change-Id: Ic9dbe6b4c016a69d0e26b6c9a232deda7f526d12
2023-01-10 19:08:26 +08:00
SoftFever
57b0a2acc3 Merge branch 'SoftFever' into SF 2022-12-18 13:22:41 +08:00
SoftFever
808ce77675 Merge branch 'SoftFever' into SoftFever-SF 2022-12-14 23:31:45 +08:00
SoftFever
417c56ee3b Merge branch 'feature/wall_order' into SF 2022-11-20 22:28:14 +08:00
2261 changed files with 253036 additions and 26262 deletions

166
.clang-format Normal file
View File

@@ -0,0 +1,166 @@
---
Language: Cpp
# BasedOnStyle: LLVM
AccessModifierOffset: -2
AlignAfterOpenBracket: Align
AlignConsecutiveMacros: None
AlignConsecutiveAssignments: None
AlignConsecutiveBitFields: None
AlignConsecutiveDeclarations: None
AlignEscapedNewlines: Right
AlignOperands: Align
AlignTrailingComments: true
AllowAllArgumentsOnNextLine: true
AllowAllConstructorInitializersOnNextLine: true
AllowAllParametersOfDeclarationOnNextLine: true
AllowShortEnumsOnASingleLine: true
AllowShortBlocksOnASingleLine: Never
AllowShortCaseLabelsOnASingleLine: false
AllowShortFunctionsOnASingleLine: All
AllowShortLambdasOnASingleLine: All
AllowShortIfStatementsOnASingleLine: Never
AllowShortLoopsOnASingleLine: false
AlwaysBreakAfterDefinitionReturnType: None
AlwaysBreakAfterReturnType: None
AlwaysBreakBeforeMultilineStrings: false
AlwaysBreakTemplateDeclarations: MultiLine
AttributeMacros:
- __capability
BinPackArguments: true
BinPackParameters: true
BraceWrapping:
AfterCaseLabel: false
AfterClass: false
AfterControlStatement: Never
AfterEnum: false
AfterFunction: false
AfterNamespace: false
AfterObjCDeclaration: false
AfterStruct: false
AfterUnion: false
AfterExternBlock: false
BeforeCatch: false
BeforeElse: false
BeforeLambdaBody: false
BeforeWhile: false
IndentBraces: false
SplitEmptyFunction: true
SplitEmptyRecord: true
SplitEmptyNamespace: true
BreakBeforeBinaryOperators: None
BreakBeforeConceptDeclarations: true
BreakBeforeBraces: Attach
BreakBeforeInheritanceComma: false
BreakInheritanceList: BeforeColon
BreakBeforeTernaryOperators: true
BreakConstructorInitializersBeforeComma: false
BreakConstructorInitializers: BeforeColon
BreakAfterJavaFieldAnnotations: false
BreakStringLiterals: true
ColumnLimit: 120
CommentPragmas: '^ IWYU pragma:'
CompactNamespaces: false
ConstructorInitializerAllOnOneLineOrOnePerLine: false
ConstructorInitializerIndentWidth: 4
ContinuationIndentWidth: 4
Cpp11BracedListStyle: true
DeriveLineEnding: true
DerivePointerAlignment: false
DisableFormat: false
EmptyLineBeforeAccessModifier: LogicalBlock
ExperimentalAutoDetectBinPacking: false
FixNamespaceComments: true
ForEachMacros:
- foreach
- Q_FOREACH
- BOOST_FOREACH
StatementAttributeLikeMacros:
- Q_EMIT
IncludeBlocks: Preserve
IncludeCategories:
- Regex: '^"(llvm|llvm-c|clang|clang-c)/'
Priority: 2
SortPriority: 0
CaseSensitive: false
- Regex: '^(<|"(gtest|gmock|isl|json)/)'
Priority: 3
SortPriority: 0
CaseSensitive: false
- Regex: '.*'
Priority: 1
SortPriority: 0
CaseSensitive: false
IncludeIsMainRegex: '(Test)?$'
IncludeIsMainSourceRegex: ''
IndentCaseLabels: false
IndentCaseBlocks: false
IndentGotoLabels: true
IndentPPDirectives: None
IndentExternBlock: AfterExternBlock
IndentRequires: false
IndentWidth: 2
IndentWrappedFunctionNames: false
InsertTrailingCommas: None
JavaScriptQuotes: Leave
JavaScriptWrapImports: true
KeepEmptyLinesAtTheStartOfBlocks: true
MacroBlockBegin: ''
MacroBlockEnd: ''
MaxEmptyLinesToKeep: 1
NamespaceIndentation: None
ObjCBinPackProtocolList: Auto
ObjCBlockIndentWidth: 2
ObjCBreakBeforeNestedBlockParam: true
ObjCSpaceAfterProperty: false
ObjCSpaceBeforeProtocolList: true
PenaltyBreakAssignment: 2
PenaltyBreakBeforeFirstCallParameter: 19
PenaltyBreakComment: 300
PenaltyBreakFirstLessLess: 120
PenaltyBreakString: 1000
PenaltyBreakTemplateDeclaration: 10
PenaltyExcessCharacter: 1000000
PenaltyReturnTypeOnItsOwnLine: 60
PenaltyIndentedWhitespace: 0
PointerAlignment: Right
ReflowComments: true
SortIncludes: true
SortJavaStaticImport: Before
SortUsingDeclarations: true
SpaceAfterCStyleCast: false
SpaceAfterLogicalNot: false
SpaceAfterTemplateKeyword: true
SpaceBeforeAssignmentOperators: true
SpaceBeforeCaseColon: false
SpaceBeforeCpp11BracedList: false
SpaceBeforeCtorInitializerColon: true
SpaceBeforeInheritanceColon: true
SpaceBeforeParens: ControlStatements
SpaceAroundPointerQualifiers: Default
SpaceBeforeRangeBasedForLoopColon: true
SpaceInEmptyBlock: false
SpaceInEmptyParentheses: false
SpacesBeforeTrailingComments: 1
SpacesInAngles: false
SpacesInConditionalStatement: false
SpacesInContainerLiterals: true
SpacesInCStyleCastParentheses: false
SpacesInParentheses: false
SpacesInSquareBrackets: false
SpaceBeforeSquareBrackets: false
BitFieldColonSpacing: Both
Standard: Latest
StatementMacros:
- Q_UNUSED
- QT_REQUIRE_VERSION
TabWidth: 4
UseCRLF: false
UseTab: Never
WhitespaceSensitiveMacros:
- STRINGIZE
- PP_STRINGIZE
- BOOST_PP_STRINGIZE
- NS_SWIFT_NAME
- CF_SWIFT_NAME
...

28
.dockerignore Normal file
View File

@@ -0,0 +1,28 @@
Build
Build.bat
/build/
deps/build
MYMETA.json
MYMETA.yml
_build
blib
xs/buildtmp
*.o
*.log
MANIFEST.bak
xs/MANIFEST.bak
xs/assertlib*
.init_bundle.ini
.vs/*
local-lib
/src/TAGS
/.vscode/
build-linux/*
deps/build-linux/*
**/.DS_Store
install_*
build_*/
SVG
Dockerfile
DockerBuild.sh
DockerRun.sh

2
.github/FUNDING.yml vendored Normal file
View File

@@ -0,0 +1,2 @@
ko_fi: SoftFever
custom: https://paypal.me/softfever3d

View File

@@ -14,11 +14,7 @@ A clear and concise description of what the bug is.
If it is related to slicing, please append the 3mf file. It could be extremely helpful to solve the issue.
**To Reproduce**
Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error
Steps to reproduce the behavior
**Expected behavior**
A clear and concise description of what you expected to happen.
@@ -26,6 +22,8 @@ A clear and concise description of what you expected to happen.
**Screenshots**
If applicable, add screenshots to help explain your problem.
**Printer model**
**Desktop (please complete the following information):**
- OS: [e.g. iOS, Windows]
- Version [e.g. 22]

View File

@@ -2,7 +2,7 @@
name: Feature request
about: Suggest an idea for this project
title: ''
labels: feature
labels: ''
assignees: ''
---

View File

@@ -1,7 +1,28 @@
name: Build Linux
on: [pull_request]
on:
push:
branches:
- main
paths:
- 'src/**'
- 'deps/**'
- '**/CMakeLists.txt'
- 'version.inc'
- 'bbl/**'
- 'resources/**'
pull_request:
branches:
- main
paths:
- 'src/**'
- 'deps/**'
- '**/CMakeLists.txt'
- 'version.inc'
- 'bbl/**'
- 'resources/**'
jobs:
appimage-builder:
name: Linux AppImage Build
@@ -13,32 +34,50 @@ jobs:
- name: Install dependencies
run: |
sudo apt-get update
sudo apt-get install cmake libgl1-mesa-dev libgtk-3-dev libxkbcommon-dev libunwind-dev libfuse2 -y
sudo apt-get install -y autoconf build-essential cmake curl eglexternalplatform-dev \
extra-cmake-modules file git libcairo2-dev libcurl4-openssl-dev libdbus-1-dev libglew-dev libglu1-mesa-dev \
libglu1-mesa-dev libgstreamer1.0-dev libgstreamerd-3-dev libgstreamer-plugins-base1.0-dev libgstreamer-plugins-good1.0-dev \
libgtk-3-dev libgtk-3-dev libmspack-dev libosmesa6-dev libsecret-1-dev libsoup2.4-dev libssl-dev libudev-dev libwayland-dev \
libwebkit2gtk-4.0-dev libxkbcommon-dev locales locales-all m4 pkgconf sudo wayland-protocols wget
- name: Install dependencies from BuildLinux.sh
shell: bash
run: sudo ./BuildLinux.sh -ur
- name: Fix permissions
shell: bash
run: sudo chown $USER -R ./
- name: build deps
id: cache_deps
uses: actions/cache@v3
env:
cache-name: ${{ runner.os }}-cache-bambustudio_deps_x64
with:
path: ${{ github.workspace }}/deps/build/destdir
key: build-${{ env.cache-name }}
# - name: Build deps
# id: cache_deps
# uses: actions/cache@v3
# env:
# cache-name: ${{ runner.os }}-cache-orcaslicer_deps_x64
# with:
# path: ${{ github.workspace }}/deps/build/destdir
# key: build-${{ env.cache-name }}
- if: ${{ steps.cache_deps.outputs.cache-hit != 'true' }}
name: build deps
# - if: ${{ steps.cache_deps.outputs.cache-hit != 'true' }}
# name: Build deps
# working-directory: ${{ github.workspace }}
# continue-on-error: true
# run: ./BuildLinux.sh -dr
- name: Download and extract deps
working-directory: ${{ github.workspace }}
continue-on-error: true
run: ./BuildLinux.sh -dr
run: |
mkdir -p ${{ github.workspace }}/deps/build
mkdir -p ${{ github.workspace }}/deps/build/destdir
curl -LJO https://github.com/SoftFever/FileSharing/releases/download/OrcaSlicer_deps_Mar/OrcaSlicer_dep_ubuntu_05-04-2023.tar.gz
tar -zxf OrcaSlicer_dep_ubuntu_05-04-2023.tar.gz -C ${{ github.workspace }}/deps/build
chown -R $(id -u):$(id -g) ${{ github.workspace }}/deps/build/destdir
ls -l ${{ github.workspace }}/deps/build/destdir
rm OrcaSlicer_dep_ubuntu_05-04-2023.tar.gz
- name: Build Studio
shell: bash
run: ./BuildLinux.sh -isr
run: |
./BuildLinux.sh -isr
chmod +x ./build/OrcaSlicer_ubu64.AppImage
- uses: actions/upload-artifact@v3
with:
name: BambuStudio-SoftFever_Linux
path: './build/BambuStudio_ubu64.AppImage'
name: OrcaSlicer_Linux
path: './build/OrcaSlicer_ubu64.AppImage'

View File

@@ -1,10 +1,31 @@
name: Build Mac arm64
name: Build Mac AppleSilicon
on: [pull_request]
on:
push:
branches:
- main
paths:
- 'src/**'
- 'deps/**'
- '**/CMakeLists.txt'
- 'version.inc'
- 'bbl/**'
- 'resources/**'
pull_request:
branches:
- main
paths:
- 'src/**'
- 'deps/**'
- '**/CMakeLists.txt'
- 'version.inc'
- 'bbl/**'
- 'resources/**'
jobs:
build_win64:
name: Build Mac arm64
build_osx_arm64:
name: Build Mac AppleSilicon
runs-on: macos-12
steps:
@@ -13,16 +34,16 @@ jobs:
- name: Install tools
run: |
brew install cmake git gettext zstd
- run: mkdir -p ${{ github.workspace }}/deps/build
# - run: mkdir -p ${{ github.workspace }}/deps/build/BambuStudio_dep
- run: mkdir -p ${{ github.workspace }}/deps/build_arm64
- run: mkdir -p ${{ github.workspace }}/deps/build_arm64/OrcaSlicer_dep_arm64
# - name: build deps
# id: cache_deps
# uses: actions/cache@v3
# env:
# cache-name: ${{ runner.os }}-cache-bambustudio_deps_arm64
# cache-name: ${{ runner.os }}-cache-orcaslicer_deps_arm64
# with:
# path: ${{ github.workspace }}/deps/build/BambuStudio_dep
# path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep
# key: build-${{ env.cache-name }}
# - if: ${{ steps.cache_deps.outputs.cache-hit != 'true' }}
@@ -33,19 +54,58 @@ jobs:
- name: Download and extract deps
working-directory: ${{ github.workspace }}
run: |
curl -LJO https://github.com/SoftFever/FileSharing/releases/download/2/BambuStudio_dep_arm64_21-01-2023.tar.gz
tar -zxvf BambuStudio_dep_arm64_21-01-2023.tar.gz -C ${{ github.workspace }}/deps/build
chown -R $(id -u):$(id -g) ${{ github.workspace }}/deps/build/BambuStudio_dep
ls -l ${{ github.workspace }}/deps/build/BambuStudio_dep
rm BambuStudio_dep_arm64_21-01-2023.tar.gz
curl -LJO https://github.com/SoftFever/FileSharing/releases/download/OrcaSlicer_deps_Mar/OrcaSlicer_dep_mac_arm64_11-03-2023.tar.gz
tar -zxf OrcaSlicer_dep_mac_arm64_11-03-2023.tar.gz -C ${{ github.workspace }}/deps/build_arm64
chown -R $(id -u):$(id -g) ${{ github.workspace }}/deps/build_arm64/OrcaSlicer_dep_arm64
ls -l ${{ github.workspace }}/deps/build_arm64/OrcaSlicer_dep_arm64
rm OrcaSlicer_dep_mac_arm64_11-03-2023.tar.gz
- name: Build studio
working-directory: ${{ github.workspace }}
run: ./build_release_macos.sh -s -n -a arm64
run: |
./build_release_macos.sh -s -n -a arm64
- name: Sign app
working-directory: ${{ github.workspace }}
if: github.event_name != 'pull_request'
env:
BUILD_CERTIFICATE_BASE64: ${{ secrets.BUILD_CERTIFICATE_BASE64 }}
P12_PASSWORD: ${{ secrets.P12_PASSWORD }}
KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
CERTIFICATE_ID: ${{ secrets.MACOS_CERTIFICATE_ID }}
run: |
CERTIFICATE_PATH=$RUNNER_TEMP/build_certificate.p12
KEYCHAIN_PATH=$RUNNER_TEMP/app-signing.keychain-db
echo -n "$BUILD_CERTIFICATE_BASE64" | base64 --decode --output $CERTIFICATE_PATH
security create-keychain -p $KEYCHAIN_PASSWORD $KEYCHAIN_PATH
security set-keychain-settings -lut 21600 $KEYCHAIN_PATH
security unlock-keychain -p $KEYCHAIN_PASSWORD $KEYCHAIN_PATH
security import $CERTIFICATE_PATH -P $P12_PASSWORD -A -t cert -f pkcs12 -k $KEYCHAIN_PATH
security list-keychain -d user -s $KEYCHAIN_PATH
security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k $P12_PASSWORD $KEYCHAIN_PATH
codesign --deep --force --verbose --sign "$CERTIFICATE_ID" ${{ github.workspace }}/build_arm64/OrcaSlicer/OrcaSlicer.app
- name: Pack app
working-directory: ${{ github.workspace }}
run: |
export ver=$(grep '^#define SoftFever_VERSION' ./build_arm64/src/libslic3r/libslic3r_version.h | cut -d ' ' -f3)
ver="_V${ver//\"}"
cd ${{ github.workspace }}/build_arm64/OrcaSlicer
zip -FSrq OrcaSlicer${ver}_Mac_AppleSilicon_signed.zip ./OrcaSlicer.app
# (wip: staple failed, error 65)
# - name: Notarize the app
# run: |
# cd ${{ github.workspace }}/build_arm64/OrcaSlicer
# xcrun notarytool store-credentials "notarytool-profile" --apple-id "${{ secrets.APPLE_DEV_ACCOUNT }}" --team-id "${{ secrets.TEAM_ID }}" --password "${{ secrets.APP_PWD }}"
# ditto -c -k --keepParent "OrcaSlicer.app" "OrcaSlicer.zip"
# xcrun notarytool submit "OrcaSlicer.zip" --keychain-profile "notarytool-profile" --wait
# xcrun stapler staple OrcaSlicer.app
# zip -FSrq OrcaSlicer_Mac_notarized.zip OrcaSlicer.app
- name: Upload artifacts
uses: actions/upload-artifact@v3
with:
name: BambuStudio-SoftFever_Mac
path: ${{ github.workspace }}/build/BambuStudio-SoftFever/BambuStudio-SoftFever*.zip
name: OrcaSlicer_Mac_AppleSilicon
path: ${{ github.workspace }}/build_arm64/OrcaSlicer/OrcaSlicer*.zip

View File

@@ -1,42 +1,110 @@
name: Build Mac x64
name: Build Mac Intel
on: [pull_request]
on:
push:
branches:
- main
paths:
- 'src/**'
- 'deps/**'
- '**/CMakeLists.txt'
- 'version.inc'
- 'bbl/**'
- 'resources/**'
pull_request:
branches:
- main
paths:
- 'src/**'
- 'deps/**'
- '**/CMakeLists.txt'
- 'version.inc'
- 'bbl/**'
- 'resources/**'
jobs:
build_win64:
name: Build Mac x64
runs-on: macos-latest
build_osx_x86_64:
name: Build Mac Intel
runs-on: macos-12
steps:
- uses: actions/checkout@v3
- name: Install tools
run: |
brew install cmake git gettext zstd
- run: mkdir -p ${{ github.workspace }}/deps/build
- run: mkdir -p ${{ github.workspace }}/deps/build/BambuStudio_dep
brew install cmake git gettext
- run: mkdir -p ${{ github.workspace }}/deps/build_x86_64
- run: mkdir -p ${{ github.workspace }}/deps/build_x86_64/OrcaSlicer_dep_x86_64
- name: build deps
id: cache_deps
uses: actions/cache@v3
env:
cache-name: ${{ runner.os }}-cache-bambustudio_deps_x64
with:
path: ${{ github.workspace }}/deps/build/BambuStudio_dep
key: build-${{ env.cache-name }}
# - name: build deps
# id: cache_deps
# uses: actions/cache@v3
# env:
# cache-name: ${{ runner.os }}-cache-orcaslicer_deps_x64
# with:
# path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep
# key: build-${{ env.cache-name }}
- if: ${{ steps.cache_deps.outputs.cache-hit != 'true' }}
name: build deps
# - if: ${{ steps.cache_deps.outputs.cache-hit != 'true' }}
# name: build deps
# working-directory: ${{ github.workspace }}
# continue-on-error: true
# run: ./build_release_macos.sh -d -a x86_64
- name: Download and extract deps
working-directory: ${{ github.workspace }}
continue-on-error: true
run: ./build_release_macos.sh -d -a x86_64
run: |
curl -LJO https://github.com/SoftFever/FileSharing/releases/download/OrcaSlicer_deps_Mar/OrcaSlicer_dep_mac_x86_64_11-03-2023.tar.gz
tar -zxf OrcaSlicer_dep_mac_x86_64_11-03-2023.tar.gz -C ${{ github.workspace }}/deps/build_x86_64
chown -R $(id -u):$(id -g) ${{ github.workspace }}/deps/build_x86_64/OrcaSlicer_dep_x86_64
ls -l ${{ github.workspace }}/deps/build_x86_64/OrcaSlicer_dep_x86_64
rm OrcaSlicer_dep_mac_x86_64_11-03-2023.tar.gz
- name: Build studio
working-directory: ${{ github.workspace }}
run: ./build_release_macos.sh -s -n -a x86_64
- name: Sign app
working-directory: ${{ github.workspace }}
env:
BUILD_CERTIFICATE_BASE64: ${{ secrets.BUILD_CERTIFICATE_BASE64 }}
P12_PASSWORD: ${{ secrets.P12_PASSWORD }}
KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
CERTIFICATE_ID: ${{ secrets.MACOS_CERTIFICATE_ID }}
if: github.event_name != 'pull_request'
run: |
CERTIFICATE_PATH=$RUNNER_TEMP/build_certificate.p12
KEYCHAIN_PATH=$RUNNER_TEMP/app-signing.keychain-db
echo -n "$BUILD_CERTIFICATE_BASE64" | base64 --decode --output $CERTIFICATE_PATH
security create-keychain -p $KEYCHAIN_PASSWORD $KEYCHAIN_PATH
security set-keychain-settings -lut 21600 $KEYCHAIN_PATH
security unlock-keychain -p $KEYCHAIN_PASSWORD $KEYCHAIN_PATH
security import $CERTIFICATE_PATH -P $P12_PASSWORD -A -t cert -f pkcs12 -k $KEYCHAIN_PATH
security list-keychain -d user -s $KEYCHAIN_PATH
security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k $P12_PASSWORD $KEYCHAIN_PATH
codesign --deep --force --verbose --sign "$CERTIFICATE_ID" ${{ github.workspace }}/build_x86_64/OrcaSlicer/OrcaSlicer.app
- name: pack app
working-directory: ${{ github.workspace }}
run: |
export ver=$(grep '^#define SoftFever_VERSION' ./build_x86_64/src/libslic3r/libslic3r_version.h | cut -d ' ' -f3)
ver="_V${ver//\"}"
cd ${{ github.workspace }}/build_x86_64/OrcaSlicer
zip -FSrq OrcaSlicer${ver}_Mac_Intel_signed.zip OrcaSlicer.app
# (wip: staple failed, error 65)
# - name: Notarize the app
# run: |
# xcrun notarytool store-credentials "notarytool-profile" --apple-id "${{ secrets.APPLE_DEV_ACCOUNT }}" --team-id "${{ secrets.TEAM_ID }}" --password "${{ secrets.APP_PWD }}"
# ditto -c -k --keepParent "OrcaSlicer.app" "OrcaSlicer.zip"
# xcrun notarytool submit "OrcaSlicer.zip" --keychain-profile "notarytool-profile" --wait
# xcrun stapler staple OrcaSlicer.app
# zip -FSrq OrcaSlicer_Mac_notarized.zip OrcaSlicer.app
- name: Upload artifacts
uses: actions/upload-artifact@v3
with:
name: BambuStudio-SoftFever_Mac
path: ${{ github.workspace }}/build/BambuStudio-SoftFever/BambuStudio-SoftFever*.zip
name: OrcaSlicer_Mac_Intel
path: ${{ github.workspace }}/build_x86_64/OrcaSlicer/OrcaSlicer*.zip

View File

@@ -1,6 +1,27 @@
name: Build Win64
on: [pull_request]
on:
push:
branches:
- main
paths:
- 'src/**'
- 'deps/**'
- '**/CMakeLists.txt'
- 'version.inc'
- 'bbl/**'
- 'resources/**'
pull_request:
branches:
- main
paths:
- 'src/**'
- 'deps/**'
- '**/CMakeLists.txt'
- 'version.inc'
- 'bbl/**'
- 'resources/**'
jobs:
build_win64:
@@ -14,24 +35,24 @@ jobs:
run: |
choco install strawberryperl
- run: mkdir ${{ github.workspace }}/deps/build
- run: mkdir ${{ github.workspace }}/deps/build/BambuStudio_dep
- run: mkdir ${{ github.workspace }}/deps/build/OrcaSlicer_dep
- name: download deps
shell: powershell
run: '(new-object System.Net.WebClient).DownloadFile("https://github.com/SoftFever/FileSharing/releases/download/2/BambuStudio_dep_21Jan2023.zip", "$env:temp\BambuStudio_dep_21Jan2023.zip")'
run: '(new-object System.Net.WebClient).DownloadFile("https://github.com/SoftFever/FileSharing/releases/download/OrcaSlicer_deps_Mar/OrcaSlicer_dep_05May2023.zip", "$env:temp\OrcaSlicer_dep_05May2023.zip")'
- name: extract deps
working-directory: ${{ github.workspace }}/deps/build
shell: cmd
run: '"C:/Program Files/7-Zip/7z.exe" x %temp%\BambuStudio_dep_21Jan2023.zip'
run: '"C:/Program Files/7-Zip/7z.exe" x %temp%\OrcaSlicer_dep_05May2023.zip'
- run: dir "${{ github.workspace }}\deps\build\BambuStudio_dep"
- run: dir "${{ github.workspace }}\deps\build\OrcaSlicer_dep"
# - name: build deps
# id: cache_deps
# uses: actions/cache@v3
# env:
# cache-name: ${{ runner.os }}-cache-bambustudio_deps
# cache-name: ${{ runner.os }}-cache-orcaslicer_deps
# with:
# path: ${{ github.workspace }}/deps/build/BambuStudio_dep
# path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep
# key: ${{ runner.os }}-build-${{ env.cache-name }}
# - if: ${{ steps.cache_deps.outputs.cache-hit != 'true' }}
@@ -40,19 +61,19 @@ jobs:
# continue-on-error: true
# run: .\build_release.bat deps
# - run: Get-ChildItem ${{ github.workspace }}/deps/build/ -Exclude BambuStudio_dep | Remove-Item -Recurse -Force
# - run: Get-ChildItem ${{ github.workspace }}/deps/build/ -Exclude OrcaSlicer_dep | Remove-Item -Recurse -Force
- name: Build studio
working-directory: ${{ github.workspace }}
run: .\build_release.bat studio
- name: pack app
working-directory: ${{ github.workspace }}/build
shell: cmd
run: '"C:/Program Files/7-Zip/7z.exe" a -tzip BambuStudio-SoftFever_dev_build.zip ${{ github.workspace }}/build/BambuStudio-SoftFever'
# - name: pack app
# working-directory: ${{ github.workspace }}/build
# shell: cmd
# run: '"C:/Program Files/7-Zip/7z.exe" a -tzip OrcaSlicer_dev_build.zip ${{ github.workspace }}/build/OrcaSlicer'
- name: Upload artifacts
uses: actions/upload-artifact@v3
with:
name: BambuStudio-SoftFever_Win64
path: ${{ github.workspace }}/build/BambuStudio-SoftFever_dev_build.zip
name: OrcaSlicer_Win64_nightly
path: ${{ github.workspace }}/build/OrcaSlicer

View File

@@ -0,0 +1,39 @@
name: Publish docs to Wiki
# Trigger this action only if there are changes pushed to the doc/** directory under the main branch
on:
push:
paths:
- doc/** # This includes all sub folders
branches:
- main # This can be changed to any branch of your preference
env:
USER_TOKEN: ${{ secrets.GH_WIKI_PAT }} # This is the repository secret personal access token
USER_NAME: ${{ vars.BOT_USER_NAME }} # Enter the username of your (bot) account
OWNER: ${{ github.event.repository.owner.name }} # This is the repository owner
REPOSITORY_NAME: ${{ github.event.repository.name }} # This is the repository name
jobs:
publish_docs_to_wiki:
name: Publish docs to Wiki
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3
# 1. Clone the current wiki master branch to a folder named `tmp_wiki`
- name: Pull content from wiki
run: |
git config --global user.name "$USER_NAME"
git config --global user.email "$USER_NAME"@users.noreply.github.com
git clone https://"$USER_TOKEN"@github.com/"$OWNER"/"$REPOSITORY_NAME".wiki.git tmp_wiki
# 4. Synchronize differences between `doc` & `tmp_wiki`
# 5. Push new Wiki content
- name: Push main repo content to wiki
run: |
rsync -av --delete doc/ tmp_wiki/ --exclude .git
cd tmp_wiki
git add .
git commit -m "Updated Wiki content"
git push origin master

7
.gitignore vendored
View File

@@ -1,6 +1,6 @@
Build
Build.bat
/build/
/build*/
deps/build
MYMETA.json
MYMETA.yml
@@ -20,6 +20,7 @@ local-lib
build-linux/*
deps/build-linux/*
**/.DS_Store
install_dir
install_release
install_*
build_*/
SVG
src/OrcaSlicer-doc/

View File

@@ -124,7 +124,7 @@ EOF
}
print "\n";
print "In the next step, you need to build the BambuStudio C++ library.\n";
print "In the next step, you need to build the OrcaSlicer C++ library.\n";
print "1) Create a build directory and change to it\n";
print "2) run cmake .. -DCMAKE_BUILD_TYPE=Release\n";
print "3) run make\n";

View File

@@ -15,13 +15,13 @@ function check_available_memory_and_disk() {
MIN_DISK_KB=$((10 * 1024 * 1024))
if [ ${FREE_MEM_GB} -le ${MIN_MEM_GB} ]; then
echo -e "\nERROR: Bambu Studio Builder requires at least ${MIN_MEM_GB}G of 'available' mem (systen has only ${FREE_MEM_GB}G available)"
echo -e "\nERROR: Orca Slicer Builder requires at least ${MIN_MEM_GB}G of 'available' mem (systen has only ${FREE_MEM_GB}G available)"
echo && free -h && echo
exit 2
fi
if [[ ${FREE_DISK_KB} -le ${MIN_DISK_KB} ]]; then
echo -e "\nERROR: Bambu Studio Builder requires at least $(echo $MIN_DISK_KB |awk '{ printf "%.1fG\n", $1/1024/1024; }') (systen has only $(echo ${FREE_DISK_KB} | awk '{ printf "%.1fG\n", $1/1024/1024; }') disk free)"
echo -e "\nERROR: Orca Slicer Builder requires at least $(echo $MIN_DISK_KB |awk '{ printf "%.1fG\n", $1/1024/1024; }') (systen has only $(echo ${FREE_DISK_KB} | awk '{ printf "%.1fG\n", $1/1024/1024; }') disk free)"
echo && df -h . && echo
exit 1
fi
@@ -56,7 +56,7 @@ while getopts ":dsiuhgbr" opt; do
echo " -g: force gtk2 build"
echo " -b: build in debug mode"
echo " -d: build deps (optional)"
echo " -s: build bambu-studio (optional)"
echo " -s: build orca-slicer (optional)"
echo " -u: only update clock & dependency packets (optional and need sudo)"
echo " -r: skip free ram check (low ram compiling)"
echo "For a first use, you want to 'sudo ./BuildLinux.sh -u'"
@@ -73,7 +73,7 @@ then
echo " -g: force gtk2 build"
echo " -b: build in debug mode"
echo " -d: build deps (optional)"
echo " -s: build bambu-studio (optional)"
echo " -s: build orca-slicer (optional)"
echo " -u: only update clock & dependency packets (optional and need sudo)"
echo " -r: skip free ram check (low ram compiling)"
echo "For a first use, you want to 'sudo ./BuildLinux.sh -u'"
@@ -192,7 +192,7 @@ then
make -j$NCORES
echo "done"
# rename wxscintilla # TODO: DeftDawg: Does BambuStudio need this?
# rename wxscintilla # TODO: DeftDawg: Does OrcaSlicer need this?
# echo "[5/9] Renaming wxscintilla library..."
# pushd destdir/usr/local/lib
# if [[ -z "$FOUND_GTK3_DEV" ]]
@@ -222,9 +222,9 @@ then
fi
if [[ -n "$BUILD_DEBUG" ]]
then
BUILD_ARGS="${BUILD_ARGS} -DCMAKE_BUILD_TYPE=Debug"
BUILD_ARGS="${BUILD_ARGS} -DCMAKE_BUILD_TYPE=Debug -DBBL_INTERNAL_TESTING=1"
else
BUILD_ARGS="${BUILD_ARGS} -DBBL_RELEASE_TO_PUBLIC=1"
BUILD_ARGS="${BUILD_ARGS} -DBBL_RELEASE_TO_PUBLIC=1 -DBBL_INTERNAL_TESTING=0"
fi
# cmake
@@ -234,7 +234,7 @@ then
# make Slic3r
echo "[8/9] Building Slic3r..."
make -j$NCORES BambuStudio # Slic3r
make -j$NCORES OrcaSlicer # Slic3r
# make .mo
# make gettext_po_to_mo # FIXME: DeftDawg: complains about msgfmt not existing even in SuperSlicer, did this ever work?

View File

@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.13)
project(BambuStudio)
project(OrcaSlicer)
include("version.inc")
include(GNUInstallDirs)
@@ -23,11 +23,11 @@ else()
endif()
endif()
option(SLIC3R_STATIC "Compile BambuStudio with static libraries (Boost, TBB, glew)" ${SLIC3R_STATIC_INITIAL})
option(SLIC3R_GUI "Compile BambuStudio with GUI components (OpenGL, wxWidgets)" 1)
option(SLIC3R_FHS "Assume BambuStudio is to be installed in a FHS directory structure" 0)
option(SLIC3R_STATIC "Compile OrcaSlicer with static libraries (Boost, TBB, glew)" ${SLIC3R_STATIC_INITIAL})
option(SLIC3R_GUI "Compile OrcaSlicer with GUI components (OpenGL, wxWidgets)" 1)
option(SLIC3R_FHS "Assume OrcaSlicer is to be installed in a FHS directory structure" 0)
option(SLIC3R_WX_STABLE "Build against wxWidgets stable (3.0) as oppsed to dev (3.1) on Linux" 0)
option(SLIC3R_PROFILE "Compile BambuStudio with an invasive Shiny profiler" 0)
option(SLIC3R_PROFILE "Compile OrcaSlicer with an invasive Shiny profiler" 0)
option(SLIC3R_PCH "Use precompiled headers" 1)
option(SLIC3R_MSVC_COMPILE_PARALLEL "Compile on Visual Studio in parallel" 1)
option(SLIC3R_MSVC_PDB "Generate PDB files on MSVC in Release mode" 1)
@@ -54,6 +54,8 @@ if (APPLE)
set(CMAKE_INSTALL_RPATH @executable_path/../Frameworks)
endif()
set(CMAKE_OSX_DEPLOYMENT_TARGET "11.3" CACHE STRING "Minimum OS X deployment version" FORCE)
SET(CMAKE_XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER "com.softfever3d.orca-slicer")
endif ()
# Proposal for C++ unit tests and sandboxes
@@ -117,7 +119,7 @@ if (MINGW)
endif ()
if (NOT MSVC)
# ARMs (Raspberry PI) use an unsigned char by default. Let's make it consistent for BambuStudio on all platforms.
# ARMs (Raspberry PI) use an unsigned char by default. Let's make it consistent for OrcaSlicer on all platforms.
add_compile_options(-fsigned-char)
endif ()
@@ -297,7 +299,7 @@ if(WIN32)
if(MSVC)
# BOOST_ALL_NO_LIB: Avoid the automatic linking of Boost libraries on Windows. Rather rely on explicit linking.
add_definitions(-DBOOST_ALL_NO_LIB -DBOOST_USE_WINAPI_VERSION=0x601 -DBOOST_SYSTEM_USE_UTF8 )
# Force the source code encoding to UTF-8. See BambuStudio GH pull request #5583
# Force the source code encoding to UTF-8. See OrcaSlicer GH pull request #5583
add_compile_options("$<$<C_COMPILER_ID:MSVC>:/utf-8>")
add_compile_options("$<$<CXX_COMPILER_ID:MSVC>:/utf-8>")
endif(MSVC)
@@ -309,24 +311,34 @@ add_definitions(-DwxUSE_UNICODE -D_UNICODE -DUNICODE -DWXINTL_NO_GETTEXT_MACRO)
add_definitions(-DwxNO_UNSAFE_WXSTRING_CONV)
if (SLIC3R_PROFILE)
message("BambuStudio will be built with a Shiny invasive profiler")
message("OrcaSlicer will be built with a Shiny invasive profiler")
add_definitions(-DSLIC3R_PROFILE)
endif ()
# Disable optimization even with debugging on.
if (0)
message(STATUS "Perl compiled without optimization. Disabling optimization for the BambuStudio build.")
message("Old CMAKE_CXX_FLAGS_RELEASE: ${CMAKE_CXX_FLAGS_RELEASE}")
message("Old CMAKE_CXX_FLAGS_RELWITHDEBINFO: ${CMAKE_CXX_FLAGS_RELEASE}")
message("Old CMAKE_CXX_FLAGS: ${CMAKE_CXX_FLAGS_RELEASE}")
set(CMAKE_CXX_FLAGS_RELEASE "/MD /Od /Zi /EHsc /DWIN32 /DTBB_USE_ASSERT")
set(CMAKE_C_FLAGS_RELEASE "/MD /Od /Zi /DWIN32 /DTBB_USE_ASSERT")
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/MD /Od /Zi /EHsc /DWIN32 /DTBB_USE_ASSERT")
set(CMAKE_C_FLAGS_RELWITHDEBINFO "/MD /Od /Zi /DWIN32 /DTBB_USE_ASSERT")
set(CMAKE_CXX_FLAGS "/MD /Od /Zi /EHsc /DWIN32 /DTBB_USE_ASSERT")
set(CMAKE_C_FLAGS "/MD /Od /Zi /DWIN32 /DTBB_USE_ASSERT")
# Disable optimization for RelWithDebInfo
if(CMAKE_C_FLAGS_RELWITHDEBINFO MATCHES "/O2")
string(REGEX REPLACE "/O2" "/Od" CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}")
endif()
if(CMAKE_CXX_FLAGS_RELWITHDEBINFO MATCHES "/O2")
string(REGEX REPLACE "/O2" "/Od" CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
endif()
if(MSVC)
if(CMAKE_C_FLAGS_RELWITHDEBINFO MATCHES "/Ob1")
string(REGEX REPLACE "/Ob1" "/Ob0" CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}")
endif()
if(CMAKE_CXX_FLAGS_RELWITHDEBINFO MATCHES "/Ob1")
string(REGEX REPLACE "/Ob1" "/Ob0" CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
endif()
set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} /RTC1")
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /RTC1")
endif()
list(REMOVE_DUPLICATES CMAKE_C_FLAGS_RELWITHDEBINFO)
list(REMOVE_DUPLICATES CMAKE_CXX_FLAGS_RELWITHDEBINFO)
# Find and configure boost
if(SLIC3R_STATIC)
# Use static boost libraries.
@@ -497,7 +509,7 @@ set(BBL_L18N_DIR "${CMAKE_CURRENT_SOURCE_DIR}/bbl/i18n")
add_custom_target(gettext_make_pot
COMMAND xgettext --keyword=L --keyword=_L --keyword=_u8L --keyword=L_CONTEXT:1,2c --keyword=_L_PLURAL:1,2 --add-comments=TRN --from-code=UTF-8 --no-location --debug --boost
-f "${BBL_L18N_DIR}/list.txt"
-o "${BBL_L18N_DIR}/BambuStudio.pot"
-o "${BBL_L18N_DIR}/OrcaSlicer.pot"
COMMAND hintsToPot ${SLIC3R_RESOURCES_DIR} ${BBL_L18N_DIR}
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
COMMENT "Generate pot file from strings in the source tree"
@@ -506,13 +518,13 @@ add_custom_target(gettext_merge_po_with_pot
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
COMMENT "Merge localization po with new generted pot file"
)
file(GLOB BBL_L10N_PO_FILES "${BBL_L18N_DIR}/*/BambuStudio*.po")
file(GLOB BBL_L10N_PO_FILES "${BBL_L18N_DIR}/*/OrcaSlicer*.po")
foreach(po_file ${BBL_L10N_PO_FILES})
GET_FILENAME_COMPONENT(po_dir "${po_file}" DIRECTORY)
SET(po_new_file "${po_dir}/BambuStudio_.po")
SET(po_new_file "${po_dir}/OrcaSlicer_.po")
add_custom_command(
TARGET gettext_merge_po_with_pot PRE_BUILD
COMMAND msgmerge -N -o ${po_file} ${po_file} "${BBL_L18N_DIR}/BambuStudio.pot"
COMMAND msgmerge -N -o ${po_file} ${po_file} "${BBL_L18N_DIR}/OrcaSlicer.pot"
DEPENDS ${po_file}
)
endforeach()
@@ -520,11 +532,11 @@ add_custom_target(gettext_po_to_mo
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
COMMENT "Generate localization po files (binary) from mo files (texts)"
)
file(GLOB L10N_PO_FILES "${BBL_L18N_DIR}/*/BambuStudio*.po")
file(GLOB L10N_PO_FILES "${BBL_L18N_DIR}/*/OrcaSlicer*.po")
foreach(po_file ${BBL_L10N_PO_FILES})
GET_FILENAME_COMPONENT(SECOND_FOLDER_ABSOLUTE ${po_file} DIRECTORY)
string(REGEX REPLACE ".*/(.*)" "\\1" po_dir "${SECOND_FOLDER_ABSOLUTE}" )
SET(mo_file "${L10N_DIR}/${po_dir}/BambuStudio.mo")
SET(mo_file "${L10N_DIR}/${po_dir}/OrcaSlicer.mo")
add_custom_command(
TARGET gettext_po_to_mo PRE_BUILD
COMMAND msgfmt ARGS --check-format -o ${mo_file} ${po_file}
@@ -553,7 +565,7 @@ endif ()
set(TOP_LEVEL_PROJECT_DIR ${PROJECT_SOURCE_DIR})
function(bambustudio_copy_dlls target config postfix output_dlls)
function(orcaslicer_copy_dlls target config postfix output_dlls)
if ("${CMAKE_SIZEOF_VOID_P}" STREQUAL "8")
set(_bits 64)
elseif ("${CMAKE_SIZEOF_VOID_P}" STREQUAL "4")
@@ -648,9 +660,9 @@ function(bambustudio_copy_dlls target config postfix output_dlls)
endfunction()
# libslic3r, BambuStudio GUI and the BambuStudio executable.
# libslic3r, OrcaSlicer GUI and the OrcaSlicer executable.
add_subdirectory(src)
set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT BambuStudio_app_gui)
set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT OrcaSlicer_app_gui)
add_dependencies(gettext_make_pot hintsToPot)
@@ -670,7 +682,7 @@ if(SLIC3R_BUILD_TESTS)
endif()
if (NOT WIN32 AND NOT APPLE)
set(SLIC3R_APP_CMD "bambu-studio")
set(SLIC3R_APP_CMD "orca-slicer")
configure_file(${LIBDIR}/platform/unix/build_appimage.sh.in ${CMAKE_CURRENT_BINARY_DIR}/build_appimage.sh @ONLY)
endif()
@@ -685,20 +697,20 @@ if (WIN32)
install(DIRECTORY "${SLIC3R_RESOURCES_DIR}/" DESTINATION "${CMAKE_INSTALL_PREFIX}/resources")
elseif (SLIC3R_FHS)
# CMAKE_INSTALL_FULL_DATAROOTDIR: read-only architecture-independent data root (share)
set(SLIC3R_FHS_RESOURCES "${CMAKE_INSTALL_FULL_DATAROOTDIR}/BambuStudio")
set(SLIC3R_FHS_RESOURCES "${CMAKE_INSTALL_FULL_DATAROOTDIR}/OrcaSlicer")
install(DIRECTORY ${SLIC3R_RESOURCES_DIR}/ DESTINATION ${SLIC3R_FHS_RESOURCES}
PATTERN "*/udev" EXCLUDE
)
install(FILES src/platform/unix/BambuStudio.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications)
install(FILES src/platform/unix/OrcaSlicer.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications)
foreach(SIZE 32 128 192)
install(FILES ${SLIC3R_RESOURCES_DIR}/images/BambuStudio_${SIZE}px.png
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/${SIZE}x${SIZE}/apps RENAME BambuStudio.png
)
endforeach()
elseif (CMAKE_MACOSX_BUNDLE)
install(DIRECTORY "${SLIC3R_RESOURCES_DIR}/" DESTINATION "${CMAKE_INSTALL_PREFIX}/BambuStudio.app/Contents/resources")
# install(DIRECTORY "${SLIC3R_RESOURCES_DIR}/" DESTINATION "${CMAKE_INSTALL_PREFIX}/OrcaSlicer.app/Contents/resources")
else ()
install(FILES src/platform/unix/BambuStudio.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/resources/applications)
install(FILES src/platform/unix/OrcaSlicer.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/resources/applications)
install(DIRECTORY "${SLIC3R_RESOURCES_DIR}/" DESTINATION "${CMAKE_INSTALL_PREFIX}/resources")
endif ()

View File

@@ -1,10 +1,10 @@
# Build Bambu Slicer in a container
#
# Build an AppImage using rootless Podman (refer to https://github.com/containers/podman/blob/main/docs/tutorials/rootless_tutorial.md):
# rm -rf build; podman build . -t bambu-studio-builder && podman run --rm localhost/bambu-studio-builder /bin/bash -c 'tar -c $(find build | grep ubu64.AppImage | head -1)' | tar -xv
# rm -rf build; podman build . -t orca-slicer-builder && podman run --rm localhost/orca-slicer-builder /bin/bash -c 'tar -c $(find build | grep ubu64.AppImage | head -1)' | tar -xv
#
# Troubleshooting the build container:
# podman run -it --name bambu-studio-builder localhost/bambu-studio-builder /bin/bash
# podman run -it --name orca-slicer-builder localhost/orca-slicer-builder /bin/bash
#
# Debugging the resulting AppImage:
# 1) Install `gdb`
@@ -13,10 +13,10 @@
# 3) Find related issue using backtrace output for clues and add backtrace to it on github
#
# Docker alternative AppImage build syntax (use this if you can't install podman):
# rm -rf build; docker build . --file Containerfile -t bambu-studio-builder; docker run --rm bambu-studio-builder /bin/bash -c 'tar -c $(find build | grep ubu64.AppImage | head -1)' | tar -xv
# rm -rf build; docker build . --file Containerfile -t orca-slicer-builder; docker run --rm orca-slicer-builder /bin/bash -c 'tar -c $(find build | grep ubu64.AppImage | head -1)' | tar -xv
#
#
# TODO: bind mount BambuStudio to inside the container instead of COPY to enable faster rebuilds during dev work.
# TODO: bind mount OrcaSlicer to inside the container instead of COPY to enable faster rebuilds during dev work.
FROM docker.io/ubuntu:20.04
LABEL maintainer "DeftDawg <DeftDawg@gmail.com>"
@@ -52,9 +52,9 @@ RUN apt-get update && apt-get install -y \
file \
sudo
COPY ./ BambuStudio
COPY ./ OrcaSlicer
WORKDIR BambuStudio
WORKDIR OrcaSlicer
# These can run together, but we run them seperate for podman caching
# Update System dependencies

15
DockerBuild.sh Executable file
View File

@@ -0,0 +1,15 @@
#!/bin/bash
PROJECT_ROOT=$(cd -P -- "$(dirname -- "$0")" && printf '%s\n' "$(pwd -P)")
set -x
# Wishlist hint: For developers, creating a Docker Compose
# setup with persistent volumes for the build & deps directories
# would speed up recompile times significantly. For end users,
# the simplicity of a single Docker image and a one-time compilation
# seems better.
docker build -t bambustudio \
--build-arg USER=$USER \
--build-arg UID=$(id -u) \
--build-arg GID=$(id -g) \
$PROJECT_ROOT

25
DockerRun.sh Executable file
View File

@@ -0,0 +1,25 @@
#!/bin/bash
set -x
# Just in case, here's some other things that might help:
# Force the container's hostname to be the same as your workstation
# -h $HOSTNAME \
# If there's problems with the X display, try this
# -v /tmp/.X11-unix:/tmp/.X11-unix \
docker run \
`# Use the hosts networking. Printer wifi and also dbus communication` \
--net=host \
`# Some X installs will not have permissions to talk to sockets for shared memory` \
--ipc host \
`# Run as your workstations username to keep permissions the same` \
-u $USER \
`# Bind mount your home directory into the container for loading/saving files` \
-v $HOME:/home/$USER \
`# Pass the X display number to the container` \
-e DISPLAY=$DISPLAY \
`# It seems that libGL and dbus things need privileged mode` \
--privileged=true \
`# Attach tty for running bambu with command line things` \
-ti \
`# Pass all parameters from this script to the bambu ENTRYPOINT binary` \
bambustudio $*

94
Dockerfile Normal file
View File

@@ -0,0 +1,94 @@
FROM docker.io/ubuntu:20.04
LABEL maintainer "DeftDawg <DeftDawg@gmail.com>"
# Disable interactive package configuration
RUN apt-get update && \
echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
# Add a deb-src
RUN echo deb-src http://archive.ubuntu.com/ubuntu \
$(cat /etc/*release | grep VERSION_CODENAME | cut -d= -f2) main universe>> /etc/apt/sources.list
RUN apt-get update && apt-get install -y \
autoconf \
build-essential \
cmake \
curl \
eglexternalplatform-dev \
extra-cmake-modules \
file \
git \
gstreamer1.0-plugins-bad \
gstreamer1.0-libav \
libcairo2-dev \
libcurl4-openssl-dev \
libdbus-1-dev \
libglew-dev \
libglu1-mesa-dev \
libglu1-mesa-dev \
libgstreamer1.0-dev \
libgstreamerd-3-dev \
libgstreamer-plugins-base1.0-dev \
libgstreamer-plugins-good1.0-dev \
libgtk-3-dev \
libgtk-3-dev \
libmspack-dev \
libosmesa6-dev \
libsecret-1-dev \
libsoup2.4-dev \
libssl-dev \
libudev-dev \
libwayland-dev \
libwebkit2gtk-4.0-dev \
libxkbcommon-dev \
locales \
locales-all \
m4 \
pkgconf \
sudo \
wayland-protocols \
wget
# Change your locale here if you want. See the output
# of `locale -a` to pick the correct string formatting.
ENV LC_ALL=en_US.utf8
RUN locale-gen $LC_ALL
# Set this so that Orca Slicer doesn't complain about
# the CA cert path on every startup
ENV SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt
COPY ./ BambuStudio
WORKDIR BambuStudio
# These can run together, but we run them seperate for podman caching
# Update System dependencies
RUN ./BuildLinux.sh -u
# Build dependencies in ./deps
RUN ./BuildLinux.sh -d
# Build slic3r
RUN ./BuildLinux.sh -s
# Build AppImage
ENV container podman
RUN ./BuildLinux.sh -i
# It's easier to run Orca Slicer as the same username,
# UID and GID as your workstation. Since we bind mount
# your home directory into the container, it's handy
# to keep permissions the same. Just in case, defaults
# are root.
SHELL ["/bin/bash", "-l", "-c"]
ARG USER=root
ARG UID=0
ARG GID=0
RUN [[ "$UID" != "0" ]] \
&& groupadd -g $GID $USER \
&& useradd -u $UID -g $GID $USER
# Using an entrypoint instead of CMD because the binary
# accepts several command line arguments.
ENTRYPOINT ["/BambuStudio/build/package/bin/orca-slicer"]

306
README.md
View File

@@ -1,269 +1,79 @@
# Bambu Studio - SoftFever
A modified version of Bambu Studio with many handy features.
It's fully compatible with Bambulab X1/X1-C/P1P printers.
It also supports Anycubic, Anker, Creality, Prusa MK3S, RatRig and Voron printers.
You can download it here: https://github.com/SoftFever/BambuStudio-SoftFever/releases
[![Build Win64](https://github.com/SoftFever/OrcaSlicer/actions/workflows/build_win.yml/badge.svg)](https://github.com/SoftFever/OrcaSlicer/actions/workflows/build_win.yml)
[![Build Mac AppleSilicon](https://github.com/SoftFever/OrcaSlicer/actions/workflows/build_mac_arm64.yml/badge.svg)](https://github.com/SoftFever/OrcaSlicer/actions/workflows/build_mac_arm64.yml)
[![Build Mac Intel](https://github.com/SoftFever/OrcaSlicer/actions/workflows/build_mac_x64.yml/badge.svg)](https://github.com/SoftFever/OrcaSlicer/actions/workflows/build_mac_x64.yml)
[![Build Linux](https://github.com/SoftFever/OrcaSlicer/actions/workflows/build_linux.yml/badge.svg)](https://github.com/SoftFever/OrcaSlicer/actions/workflows/build_linux.yml)
## BambuStudio SoftFever change notes:
# Orca Slicer
Orca Slicer is a fork of Bambu Studio. It was previously known as BambuStudio-SoftFever.
Bambu Studio is based on [PrusaSlicer](https://github.com/prusa3d/PrusaSlicer) by Prusa Research, which is from [Slic3r](https://github.com/Slic3r/Slic3r) by Alessandro Ranellucci and the RepRap community.
Orca Slicer incorporates a lot of features from SuperSlicer by @supermerill
### [V1.4.2 changes](https://github.com/SoftFever/BambuStudio-SoftFever/releases/tag/v1.4.2):
- Change the color theme :)
- Fixed a crash issue when selecting vase mode on some machines
- Port firmware retraction and Extra length on restart retraction feature from PrusaSlicer
- Fine-tune calibration features
1. Enforce max volumetric speed in PA line mode
2. Ensure print speeds are consistent across all blocks in the flow-rate calibration process. This is to help users calibrate those challenging filaments(such as TPU) by minimizing the influence of printing speed - thanks @psiberfunk for his input on this
- New printer models: thanks @erebus04 and @GP3D84
1. Tronxy X5SA 400
2. Artillery Sidewinder
- QoL:
1. Now allow exporting g-code for BBL printers
2. Fixed a bug that printer connection info was removed after loading a 3mf project
fixed an issue that user presets were not loaded when Auto sync user preset option was off in Preference.
3.Germany language translation - thanks @hliebscher
- Misc fixes:
1. Exit calibration mode when a new model is added to the scene(creating a new project after calibration is recommended)
2. Skip emitting M106 P2 command if the auxiliary fan is not enabled.
3. Fix an issue that previously there was a z-fighting issue when bed models are used for 3rd party printers
4. Fixed an issue that max volumetric speed was not correctly calculated if flow-rate was changed per object.
5. CICD for Linux build - thanks @fang64
Known issues:
The Calibration menu is missing on some Mac machines. Try restarting the App can usually fix it. See [#120](https://github.com/SoftFever/BambuStudio-SoftFever/issues/120)
Prebuilt binaries are available through the [github releases page](https://github.com/SoftFever/OrcaSlicer/releases/).
### [V1.4.1 changes](https://github.com/SoftFever/BambuStudio-SoftFever/releases/tag/v1.4.1):
- Added a feature for checking and displaying a notification for a new version
- Added RatRig printer profiles, thanks @erebus04 for working this
- Added support for the Creality CR-10 Max and Anker M5 printers.
- Fixed the issue with profile cloud syncing for third-party printers.
- set inner_wall_acceleration to 5000 for Bambu printers
- Added support for the first_layer_bed_temperature and first_layer_temperature variables for better compatibility."
- Fixed a crashing bug when adding text Mac Intel machine
- QoL improvements for naming logic:
1. The filename format is now supported when exporting 3mf files.
2. If the project is not defined, the model name will be used as the output name.
3. The "Untitled" string will no longer be added if the project name is set.
4. The "_plate_0" string has been removed from the file name if there is only one plate.
<details>
<summary> 👉 "Click here" for OLD Release Note</summary>
### [V1.4.0 changes](https://github.com/SoftFever/BambuStudio-SoftFever/releases/tag/v1.4.0):
- Add Layer Time/Layer time(Log) display (NOTE: need more tweaking work for BBL printers as the layer time is skewed by the preparing time)
- Add `sandwich`(inner-outer-inner-infill) mode support for Arachne engine.
- Change default `wall loop` from 2 to 3
- Fix an issue that the last used printer was not remembered after application restart. (Thanks Bambulab engineers, for the quick response and fixing)
- Optimized layer height sanity check logic. It will check against `max_layer_height` in the printer settings now. (I can use CHT 1.8 nozzle to print 1.0 mm thick layers now ;) )
- Add Prusa MINI+ profile
- expose `bed_exclude_area` parameter to 3rd printers
- Fix some 3rd party printer related issues introduced in [BambuStudio v01.04.00.17](https://github.com/bambulab/BambuStudio/releases/tag/v01.04.00.17)
1. Can't send sliced files to printers
2. AMS filaments were added to non-Bambulab printers
3. Wrong bed setting was applied
### [V1.3.4 changes](https://github.com/SoftFever/BambuStudio-SoftFever/releases/tag/v1.3.4):
1. Add a new printer order - sandwich mode:
This new order is similar to the outer-wall-first mode in achieving the best dimensional accuracy. This new approach however avoids printing outer walls right after a long travel, which may cause artifacts on the surface in many cases.
sandwich-mode1
sandwich-mode2
2. Support RRF firmware(experimental)
3. Fix a compatibility issue for gcode-preview
4. Merge upstream changes
# Main features
- Auto calibrations for all printers
- Sandwich(inner-outer-inner) mode - an improved version of the `External perimeters first` mode
- Precise wall
- Klipper support
- More granular controls
- More features can be found in [change notes](https://github.com/SoftFever/OrcaSlicer/releases/)
### [V1.3.3 changes](https://github.com/SoftFever/BambuStudio-SoftFever/releases/tag/v1.3.3):
1. Improve top surface quality.
Fix a bug that internal solid infills didn't use monotonic when top surface is using monotonic lines
2. New feature: filter out tiny gaps.
Note: for aesthetic considerations, this setting won't affect top/bottom layers. In other words, gap fills that can be seen from outside won't be filtered out
3. PA(pressure advance) now support multi-color printing. A new PA value from the selected filament profile will be applied whenever there is
a filament/extruder change action. This change only affects multi-color printing.
5. Users can now set float values of layer time in Filament->Cooling tab.
6. Allow to set target bed temp to 0
7. Fix a bug that layer number is not displayed correctly in klipper UIs
8. Force using linear PA model when manual PA override is enabled for Bambu machines
9. Remember the last used filament
10. Skip checking BL network plugin for third-party printers.
### [V1.3.2 changes](https://github.com/SoftFever/BambuStudio-SoftFever/releases/tag/v1.3.2-sf):
1. Support device control view for 3rd party printers
2. Port `Small perimeters` feature from PrusaSlicer. I also add an extra option to adjust the small perimeter threshold
You might want to reduce speed for small perimeter parts to prevent failures like bellow:
3. Add fan speed preview mode
4. Fix an issue that print time estimation is inaccurate when `Klipper` g-code style is used.
### [V1.3.1 changes](https://github.com/SoftFever/BambuStudio-SoftFever/releases/tag/v1.3.1-sf):
1. Support change bed size and nozzle diameter
2. Allow users to specify the bridge infill direction
3. bridge_infill_direction1
4. bridge_infill_direction2
5. Change to ISO view angle for preview image
6. Add an option to change Z Hop action: NormalLift/SpiralLift
7. Optimise g-code generation for both Bambu printers and 3rd party printers
8. Support Klipper Exclude Objects
9. Better support for Moonraker's metadata.
# How to install
**Windows**:
1. Unzip the binaries to any folder you prefer, then execute orca-slicer.exe to start the application.
- *If you have troubles to run the build, you might need to install following runtimes:*
- [MicrosoftEdgeWebView2RuntimeInstallerX64](https://github.com/SoftFever/BambuStudio-SoftFever/releases/download/v1.0.10-sf2/MicrosoftEdgeWebView2RuntimeInstallerX64.exe)
- [vcredist2019_x64](https://github.com/SoftFever/BambuStudio-SoftFever/releases/download/v1.0.10-sf2/vcredist2019_x64.exe)
### [V1.2.5.3 changes](https://github.com/SoftFever/BambuStudio-SoftFever/releases/tag/v1.2.5.3-sf):
1. Label objects to support Klipper Exclude Objects feature
2. Allow users to change output file name format
3. Fix a bug that pressure advance value was not saved in the profile
4. Optimize non-Bambu printer profiles
5. Remove M900 S0 which is not necessary.
**Mac**:
1. Download the right binaries for your computer: `arm64` version for Apple Silicon and `x86_64` for Intel CPU.
2. Double click to unzip the package, move OrcaSlicer.app to Application folder.
3. The app is signed but not notarized at the moment due to the proptiery network plugin.
We have two options to make it run on our machines
- Option 1:
Execute this command in terminal: `xattr -dr com.apple.quarantine /Applications/OrcaSlicer.app`
```console
softfever@mac:~$ xattr -dr com.apple.quarantine /Applications/OrcaSlicer.app
```
- Option 2:
- Step 1: open the app, a warning window will pop up
![image](./SoftFever_doc/mac_cant_open.png)
- Step 2: in `System Settings` -> `Privacy & Security`, click `Open Anyway`:
![image](./SoftFever_doc/mac_security_setting.png)
### [V1.2.5 changes](https://github.com/SoftFever/BambuStudio-SoftFever/releases/tag/v1.2.5-sf):
1. Add options to adjust jerk for different line types
2. Add an option to adjust acceleration for travel. Higher acceleration for travel and lower acceleration for the outer wall makes it possible to print faster and nicer.
3. Add an option to manually override the Pressure Advance / Linear Advance for each filament.
**Linux(Ubuntu)**:
1. If you run into trouble to execute it, try this command in terminal:
`chmod +x /path_to_appimage/OrcaSlicer_ubu64.AppImage`
# How to compile
- Windows 64-bit
- Tools needed: Visual Studio 2019, Cmake, git, Strawberry Perl.
- Run `build_release.bat` in `x64 Native Tools Command Prompt for VS 2019`
### [V1.2.4 changes](https://github.com/SoftFever/BambuStudio-SoftFever/releases/tag/v1.2.4-sf):
1. Allow users to adjust accelerations for inner/outer walls separately.
2. Allow users to adjust the bottom surface flow-rate
3. Fix an issue that bed temperature for other layers is not set properly. This bug exists in the upstream as well. My PR here(bambulab#319)
- Mac 64-bit
- Tools needed: Xcode, Cmake, git, gettext
- run `build_release_macos.sh`
### [V1.2 changes](https://github.com/SoftFever/BambuStudio-SoftFever/releases/tag/v1.2-sf):
1. Allow user to change machine limits
2. Allow users to adjust the top surface flow-rate.
3. Unlock some cool hidden features in BambuStudio.
4. Fix an issue that the software connected to Bambulab's staging server by default. (Only Bambulab machines were affected)
- Ubuntu
- run `BuildLinux.sh -udisr`
### [V1.1 changes](https://github.com/SoftFever/BambuStudio-SoftFever/releases/tag/v1.1):
1. Support third-party printers:
- Voron 2.4
- Voron Trident
- Voron 0.1
- Prusa MK3S
2. Export to to .gcode file.
3. Send gcode file to printer
4. Support single wall mode on first layer
5. Support Chamber temperature. This setting can be use in machine start G-Gcode
6. Support thumbview for third-party printers
</details>
Demo video: https://youtu.be/vSNE9iGj2II
## NOTE:
## 1. For Apple M1 users, please take a look at this [article](https://www.howtogeek.com/803598/app-is-damaged-and-cant-be-opened/ ) about how to run unsigned applications on your machine. Or better, you can build it from the source codes if you want:)
Apple requires a subscription(costs 99$ yearly) for developers to sign their app. I don't do a lot of dev work on Mac, and this is a nonprofit open-source project, so I decided not to pay the money ;)
## 2. If you have troubles to run the build, you might need to install following runtimes:
- [MicrosoftEdgeWebView2RuntimeInstallerX64](https://github.com/SoftFever/BambuStudio-SoftFever/releases/download/v1.0.10-sf2/MicrosoftEdgeWebView2RuntimeInstallerX64.exe)
- [vcredist2019_x64](https://github.com/SoftFever/BambuStudio-SoftFever/releases/download/v1.0.10-sf2/vcredist2019_x64.exe)
## 3. BambuStudio use G2/G3 commands by default. You need to turn on ARC support in your printer's firmware use with this slicer.
- For Voron and any Klipper based printers:
You can enable gcode_arcs(G2/G3) support by adding following section into you printer.cfg file:
# Note:
If you're running Klipper, it's recommended to add the following configuration to your `printer.cfg` file.
```
# Enable object exclusion
[exclude_object]
# Enable arcs support
[gcode_arcs]
resolution: 0.1
[gcode_macro m201]
gcode:
{% if 'X' in params or 'Y' in params %}
{% set accel = (params.X|default(params.Y)|float,
params.Y|default(params.X)|float)|min %}
SET_VELOCITY_LIMIT ACCEL={accel} ACCEL_TO_DECEL={accel * 0.5}
{% else %}
SET_VELOCITY_LIMIT
{% endif %}
[gcode_macro m203]
gcode:
{% if 'X' in params or 'Y' in params %}
{% set speed = (params.X|default(params.Y)|float,
params.Y|default(params.X)|float)|min %}
SET_VELOCITY_LIMIT VELOCITY={speed}
{% else %}
SET_VELOCITY_LIMIT
{% endif %}
[gcode_macro M205]
gcode:
{% if 'X' in params or 'Y' in params %}
{% set corner_speed = (params.X|default(params.Y)|float,
params.Y|default(params.X)|float)|min %}
SET_VELOCITY_LIMIT SQUARE_CORNER_VELOCITY={corner_speed}
{% else %}
SET_VELOCITY_LIMIT
{% endif %}
[gcode_macro M900]
gcode:
SET_PRESSURE_ADVANCE ADVANCE={params.K}
```
~~ It's also recommended to add followinging dummy macros to make Klipper happy ~~
Update: latest Klipper has supported G17 command. Don't add following macro if you are running on latest Klipper.
```
# Make BambuStudio happy
[gcode_macro G17]
gcode:
```
- For Prusa MK3S:
ARC movement are supported by default.
# Gallery
![image](./SoftFever_doc/accelerations.png)
![image](./SoftFever_doc/BambuLab.png)
![image](./SoftFever_doc/Anker.png)
![image](./SoftFever_doc/Anycubic.png)
![image](./SoftFever_doc/Creality.png)
![image](./SoftFever_doc/Prusa.png)
![image](./SoftFever_doc/RatRig.png)
![image](./SoftFever_doc/Voron_1.png)
![image](./SoftFever_doc/Voron_2.png)
Image credits:
1. Voron 2.4 and Trident: vorondesign.com
3. Voron 0.1: myself
4. Prusa MK3S: Prusa3d
=========================SPLIT=========================
![image](https://user-images.githubusercontent.com/106916061/179006347-497d24c0-9bd6-45b7-8c49-d5cc8ecfe5d7.png)
# BambuStudio
Bambu Studio is a cutting-edge, feature-rich slicing software.
It contains project-based workflows, systematically optimized slicing algorithms, and an easy-to-use graphic interface, bringing users an incredibly smooth printing experience.
Prebuilt Windows, macOS 64-bit releases are available through the [github releases page](https://github.com/bambulab/BambuStudio/releases/).
Linux version currently is not supported.
Bambu Studio is based on [PrusaSlicer](https://github.com/prusa3d/PrusaSlicer) by Prusa Research, which is from [Slic3r](https://github.com/Slic3r/Slic3r) by Alessandro Ranellucci and the RepRap community.
See the [wiki](https://github.com/bambulab/BambuStudio/wiki) and the [documentation directory](https://github.com/bambulab/BambuStudio/tree/master/doc) for more informations.
# What are Bambu Studio's main features?
Key features are:
- Basic slicing features & GCode viewer
- Multiple plates management
- Remote control & monitoring
- Auto-arrange objects
- Auto-orient objects
- Hybrid/Tree/Normal support types, Customized support
- multi-material printing and rich painting tools
- multi-platform (Win/Mac/Linux) support
- Global/Object/Part level slicing parameters
Other major features are:
- Advanced cooling logic controlling fan speed and dynamic print speed
- Auto brim according to mechanical analysis
- Support arc path(G2/G3)
- Support STEP format
- Assembly & explosion view
- Flushing transition-filament into infill/object during filament change
# How to compile
Following platforms are currently supported to compile:
- Windows 64-bit, [Compile Guide](https://github.com/bambulab/BambuStudio/wiki/Windows-Compile-Guide)
- Mac 64-bit, [Compile Guide](https://github.com/bambulab/BambuStudio/wiki/Mac-Compile-Guide)
# Report issue
You can add an issue to the [github tracker](https://github.com/bambulab/BambuStudio/issues) if **it isn't already present.**
# License
Orca Slicer is licensed under the GNU Affero General Public License, version 3. Orca Slicer is based on Bambu Studio by BambuLab.
Bambu Studio is licensed under the GNU Affero General Public License, version 3. Bambu Studio is based on PrusaSlicer by PrusaResearch.
PrusaSlicer is licensed under the GNU Affero General Public License, version 3. PrusaSlicer is owned by Prusa Research. PrusaSlicer is originally based on Slic3r by Alessandro Ranellucci.
@@ -272,5 +82,5 @@ Slic3r is licensed under the GNU Affero General Public License, version 3. Slic3
The GNU Affero General Public License, version 3 ensures that if you use any part of this software in any way (even behind a web server), your software must be released under the same license.
The bambu networking plugin is based on non-free libraries. It is optional to the Bambu Studio and provides extended functionalities for users.
The bambu networking plugin is based on non-free libraries. It is optional to the Orca Slicer and provides extended functionalities for users.

Binary file not shown.

After

Width:  |  Height:  |  Size: 46 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 69 KiB

File diff suppressed because it is too large Load Diff

9980
bbl/i18n/cs/OrcaSlicer_cs.po Executable file

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

10257
bbl/i18n/de/OrcaSlicer_de.po Normal file

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

10450
bbl/i18n/ja/OrcaSlicer_ja.po Normal file

File diff suppressed because it is too large Load Diff

View File

@@ -16,10 +16,12 @@ src/slic3r/GUI/Gizmos/GLGizmoText.cpp
src/slic3r/GUI/Gizmos/GLGizmoText.hpp
src/slic3r/GUI/GUI.cpp
src/slic3r/GUI/GUI_App.cpp
src/slic3r/GUI/GUI_AuxiliaryList.cpp
src/slic3r/GUI/GUI_Init.cpp
src/slic3r/GUI/GUI_Factories.cpp
src/slic3r/GUI/GUI_ObjectList.cpp
src/slic3r/GUI/GUI_ObjectSettings.cpp
src/slic3r/GUI/GUI_ObjectLayers.cpp
src/slic3r/GUI/GUI_ObjectTable.cpp
src/slic3r/GUI/GUI_ObjectTable.hpp
src/slic3r/GUI/GUI_ObjectTableSettings.cpp
@@ -39,6 +41,7 @@ src/slic3r/GUI/Jobs/RotoptimizeJob.cpp
src/slic3r/GUI/Jobs/BindJob.cpp
src/slic3r/GUI/Jobs/PrintJob.cpp
src/slic3r/GUI/Jobs/SendJob.cpp
src/slic3r/GUI/Jobs/SLAImportJob.cpp
src/slic3r/GUI/Jobs/UpgradeNetworkJob.cpp
src/slic3r/GUI/AboutDialog.cpp
src/slic3r/GUI/AMSMaterialsSetting.cpp
@@ -83,6 +86,8 @@ src/slic3r/GUI/Preferences.cpp
src/slic3r/GUI/PresetComboBoxes.cpp
src/slic3r/GUI/PresetHints.cpp
src/slic3r/GUI/ProgressStatusBar.cpp
src/slic3r/GUI/PlateSettingsDialog.cpp
src/slic3r/GUI/PrivacyUpdateDialog.cpp
src/slic3r/GUI/PublishDialog.cpp
src/slic3r/GUI/SavePresetDialog.cpp
src/slic3r/GUI/Search.cpp
@@ -90,7 +95,6 @@ src/slic3r/GUI/Selection.cpp
src/slic3r/GUI/SelectMachine.cpp
src/slic3r/GUI/SendSystemInfoDialog.cpp
src/slic3r/GUI/SendToPrinter.cpp
src/slic3r/GUI/SetBedTypeDialog.cpp
src/slic3r/GUI/BindDialog.cpp
src/slic3r/GUI/Tab.cpp
src/slic3r/GUI/Tab.hpp
@@ -106,6 +110,7 @@ src/slic3r/GUI/KBShortcutsDialog.cpp
src/slic3r/GUI/ReleaseNote.cpp
src/slic3r/GUI/ReleaseNote.hpp
src/slic3r/GUI/UpgradePanel.cpp
src/slic3r/GUI/UnsavedChangesDialog.cpp
src/slic3r/Utils/FixModelByWin10.cpp
src/slic3r/Utils/PresetUpdater.cpp
src/slic3r/Utils/Http.cpp
@@ -125,4 +130,5 @@ src/libslic3r/PrintObject.cpp
src/libslic3r/PrintObjectSlice.cpp
src/libslic3r/PlaceholderParser.cpp
src/libslic3r/TreeSupport.cpp
src/slic3r/GUI/calib_dlg.cpp
src/slic3r/GUI/PhysicalPrinterDialog.cpp

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -2,12 +2,12 @@ set WP=%CD%
cd deps
mkdir build
cd build
set DEPS=%CD%/BambuStudio_dep
set DEPS=%CD%/OrcaSlicer_dep
if "%1"=="studio" (
GOTO :studio
)
echo "building deps.."
cmake ../ -G "Visual Studio 16 2019" -DDESTDIR="%CD%/BambuStudio_dep" -DCMAKE_BUILD_TYPE=Release
cmake ../ -G "Visual Studio 16 2019" -DDESTDIR="%CD%/OrcaSlicer_dep" -DCMAKE_BUILD_TYPE=Release
cmake --build . --config Release --target ALL_BUILD -- -m
if "%1"=="deps" exit /b 0
@@ -18,6 +18,6 @@ cd %WP%
mkdir build
cd build
cmake .. -G "Visual Studio 16 2019" -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="%DEPS%/usr/local" -DCMAKE_INSTALL_PREFIX="./BambuStudio-SoftFever" -DCMAKE_BUILD_TYPE=Release -DWIN10SDK_PATH="C:/Program Files (x86)/Windows Kits/10/Include/10.0.19041.0"
cmake .. -G "Visual Studio 16 2019" -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="%DEPS%/usr/local" -DCMAKE_INSTALL_PREFIX="./OrcaSlicer" -DCMAKE_BUILD_TYPE=Release -DWIN10SDK_PATH="C:/Program Files (x86)/Windows Kits/10/Include/10.0.19041.0"
cmake --build . --config Release --target ALL_BUILD -- -m
cmake --build . --target install --config Release

View File

@@ -1,10 +1,13 @@
#!/bin/sh
while getopts ":a:sdhn" opt; do
while getopts ":a:sdphn" opt; do
case ${opt} in
d )
export BUILD_TARGET="deps"
;;
p )
export PACK_DEPS="1"
;;
a )
export ARCH="$OPTARG"
;;
@@ -32,15 +35,24 @@ fi
echo "Arch: $ARCH"
echo "BUILD_TARGET: $BUILD_TARGET"
brew --prefix libiconv
brew --prefix zstd
export LIBRARY_PATH=$LIBRARY_PATH:$(brew --prefix zstd)/lib/
if which -s brew; then
brew --prefix libiconv
brew --prefix zstd
export LIBRARY_PATH=$LIBRARY_PATH:$(brew --prefix zstd)/lib/
elif which -s port; then
port install libiconv
port install zstd
export LIBRARY_PATH=$LIBRARY_PATH:/opt/local/lib
else
echo "Need either brew or macports to successfully build deps"
exit 1
fi
WD="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
cd $WD/deps
mkdir -p build
cd build
DEPS=$PWD/BambuStudio_dep
mkdir -p build_$ARCH
cd build_$ARCH
DEPS=$PWD/OrcaSlicer_dep_$ARCH
mkdir -p $DEPS
if [ "studio." != $BUILD_TARGET. ];
then
@@ -48,6 +60,10 @@ then
echo "cmake ../ -DDESTDIR=$DEPS -DOPENSSL_ARCH=darwin64-${ARCH}-cc -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES:STRING=${ARCH}"
cmake ../ -DDESTDIR="$DEPS" -DOPENSSL_ARCH="darwin64-${ARCH}-cc" -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES:STRING=${ARCH}
cmake --build . --config Release --target all
if [ "1." == "$PACK_DEPS". ];
then
tar -zcvf OrcaSlicer_dep_mac_${ARCH}_$(date +"%d-%m-%Y").tar.gz OrcaSlicer_dep_$ARCH
fi
fi
@@ -57,29 +73,28 @@ then
fi
cd $WD
mkdir -p build
cd build
mkdir -p build_$ARCH
cd build_$ARCH
echo "building studio..."
cmake .. -GXcode -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="$DEPS/usr/local" -DCMAKE_INSTALL_PREFIX="$PWD/BambuStudio-SoftFever" -DCMAKE_BUILD_TYPE=Release -DCMAKE_MACOSX_RPATH=ON -DCMAKE_INSTALL_RPATH="$DEPS/usr/local" -DCMAKE_MACOSX_BUNDLE=ON -DCMAKE_OSX_ARCHITECTURES=${ARCH}
cmake .. -GXcode -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="$DEPS/usr/local" -DCMAKE_INSTALL_PREFIX="$PWD/OrcaSlicer" -DCMAKE_BUILD_TYPE=Release -DCMAKE_MACOSX_RPATH=ON -DCMAKE_INSTALL_RPATH="$DEPS/usr/local" -DCMAKE_MACOSX_BUNDLE=ON -DCMAKE_OSX_ARCHITECTURES=${ARCH}
cmake --build . --config Release --target ALL_BUILD
mkdir -p BambuStudio-SoftFever
cd BambuStudio-SoftFever
rm -r ./BambuStudio-SoftFever.app
cp -pR ../src/Release/BambuStudio.app ./BambuStudio-SoftFever.app
resources_path=$(readlink ./BambuStudio-SoftFever.app/Contents/Resources)
rm ./BambuStudio-SoftFever.app/Contents/Resources
cp -R $resources_path ./BambuStudio-SoftFever.app/Contents/Resources
mkdir -p OrcaSlicer
cd OrcaSlicer
rm -r ./OrcaSlicer.app
cp -pR ../src/Release/OrcaSlicer.app ./OrcaSlicer.app
resources_path=$(readlink ./OrcaSlicer.app/Contents/Resources)
rm ./OrcaSlicer.app/Contents/Resources
cp -R $resources_path ./OrcaSlicer.app/Contents/Resources
# delete .DS_Store file
find ./BambuStudio-SoftFever.app/ -name '.DS_Store' -delete
find ./OrcaSlicer.app/ -name '.DS_Store' -delete
# extract version
export ver="_dev"
echo $PWD
if [ "1." != "$NIGHTLY_BUILD". ];
then
ver=$(grep '^#define SoftFever_VERSION' ../src/libslic3r/libslic3r_version.h | cut -d ' ' -f3)
ver="_V${ver//\"}"
fi
# export ver=$(grep '^#define SoftFever_VERSION' ../src/libslic3r/libslic3r_version.h | cut -d ' ' -f3)
# ver="_V${ver//\"}"
# echo $PWD
# if [ "1." != "$NIGHTLY_BUILD". ];
# then
# ver=${ver}_dev
# fi
zip -FSr BambuStudio-SoftFever${ver}_Mac_${ARCH}.zip BambuStudio-SoftFever.app
# zip -FSr OrcaSlicer${ver}_Mac_${ARCH}.zip OrcaSlicer.app

View File

@@ -2,13 +2,22 @@ set WP=%CD%
cd deps
mkdir build
cd build
set DEPS=%CD%/BambuStudio_dep
cmake ../ -G "Visual Studio 16 2019" -DDESTDIR="%CD%/BambuStudio_dep" -DCMAKE_BUILD_TYPE=Release
set DEPS=%CD%/OrcaSlicer_dep
if "%1"=="studio" (
GOTO :studio
)
echo "building deps.."
cmake ../ -G "Visual Studio 16 2019" -DDESTDIR="%CD%/OrcaSlicer_dep" -DCMAKE_BUILD_TYPE=Release
cmake --build . --config Release --target ALL_BUILD -- -m
if "%1"=="deps" exit /b 0
:studio
echo "building studio..."
cd %WP%
mkdir build
cd build
cmake .. -G "Visual Studio 16 2019" -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="%DEPS%/usr/local" -DCMAKE_INSTALL_PREFIX="./BambuStudio-SoftFever" -DCMAKE_BUILD_TYPE=RelWithDebInfo -DWIN10SDK_PATH="C:/Program Files (x86)/Windows Kits/10/Include/10.0.19041.0"
cmake .. -G "Visual Studio 16 2019" -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="%DEPS%/usr/local" -DCMAKE_INSTALL_PREFIX="./OrcaSlicer" -DCMAKE_BUILD_TYPE=Release -DWIN10SDK_PATH="C:/Program Files (x86)/Windows Kits/10/Include/10.0.19041.0"
cmake --build . --config RelWithDebInfo --target ALL_BUILD -- -m
@REM cmake --build . --target install --config RelWithDebInfo

View File

@@ -28,12 +28,12 @@
@ECHO deps-dirty - build deps without cleaning
@ECHO Default: %PS_STEPS_DEFAULT%
@ECHO -r -RUN Specifies what to perform at the run step:
@ECHO console - run and wait on bambu-studio-console.exe
@ECHO console - run and wait on orca-slicer-console.exe
@ECHO custom - run and wait on your custom build/%PS_CUSTOM_RUN_FILE%
@ECHO ide - open project in Visual Studio if not open (no wait)
@ECHO none - run step does nothing
@ECHO viewer - run bambu-gcodeviewer.exe (no wait)
@ECHO window - run bambu-studio.exe (no wait)
@ECHO window - run orca-slicer.exe (no wait)
@ECHO Default: none
@ECHO -d -DESTDIR Deps destination directory
@ECHO Warning: Changing destdir path will not delete the old destdir.
@@ -246,11 +246,11 @@ FOR /F "tokens=2 delims=," %%I in (
@ECHO Running %PS_RUN% application...
@REM icacls below is just a hack for file-not-found error handling
IF "%PS_RUN%" EQU "console" (
icacls bambu-studio-console.exe >nul || GOTO :END
start /wait /b bambu-studio-console.exe
icacls orca-slicer-console.exe >nul || GOTO :END
start /wait /b orca-slicer-console.exe
) ELSE IF "%PS_RUN%" EQU "window" (
icacls bambu-studio.exe >nul || GOTO :END
start bambu-studio.exe
icacls orca-slicer.exe >nul || GOTO :END
start orca-slicer.exe
) ELSE IF "%PS_RUN%" EQU "viewer" (
icacls bambu-gcodeviewer.exe >nul || GOTO :END
start bambu-gcodeviewer.exe

View File

@@ -11,7 +11,7 @@
<key>CFBundleIconFile</key>
<string>${MACOSX_BUNDLE_ICON_FILE}</string>
<key>CFBundleIdentifier</key>
<string>com.bambulab.bambu-studio</string>
<string>com.softfever3d.orca-slicer</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>

125
deps/Boost/0001-Boost-fix.patch vendored Normal file
View File

@@ -0,0 +1,125 @@
From 1d6cd7c2f8640db3cda194c1b9b82f1e4b321395 Mon Sep 17 00:00:00 2001
From: "chunmao.guo" <chunmao.guo@bambulab.com>
Date: Thu, 5 Jan 2023 15:55:57 +0800
Subject: [PATCH] FIX: limit_handles
---
boost/process/detail/posix/executor.hpp | 4 +++-
boost/process/detail/posix/pipe_out.hpp | 13 +++++++++++--
boost/process/detail/used_handles.hpp | 3 +++
boost/process/detail/windows/handles.hpp | 10 +++++++---
4 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/boost/process/detail/posix/executor.hpp b/boost/process/detail/posix/executor.hpp
index ca7713c..5521720 100644
--- a/boost/process/detail/posix/executor.hpp
+++ b/boost/process/detail/posix/executor.hpp
@@ -325,6 +325,7 @@ public:
}
void set_error(const std::error_code &ec, const std::string &msg) {set_error(ec, msg.c_str());};
+ int error_sink() const { return _pipe_sink; }
};
template<typename Sequence>
@@ -388,6 +389,8 @@ child executor<Sequence>::invoke(boost::mpl::false_, boost::mpl::false_)
set_error(err, "fcntl(2) failed");//this might throw, so we need to be sure our pipe is safe.
return child();
}
+ _pipe_sink = p.p[1];
+
_ec.clear();
boost::fusion::for_each(seq, call_on_setup(*this));
@@ -411,7 +414,6 @@ child executor<Sequence>::invoke(boost::mpl::false_, boost::mpl::false_)
}
else if (pid == 0)
{
- _pipe_sink = p.p[1];
::close(p.p[0]);
boost::fusion::for_each(seq, call_on_exec_setup(*this));
diff --git a/boost/process/detail/posix/pipe_out.hpp b/boost/process/detail/posix/pipe_out.hpp
index d54cca4..a081d78 100644
--- a/boost/process/detail/posix/pipe_out.hpp
+++ b/boost/process/detail/posix/pipe_out.hpp
@@ -18,7 +18,7 @@
namespace boost { namespace process { namespace detail { namespace posix {
template<int p1, int p2>
-struct pipe_out : handler_base_ext
+struct pipe_out : handler_base_ext, ::boost::process::detail::uses_handles
{
int sink;
int source; //opposite end
@@ -30,6 +30,14 @@ struct pipe_out : handler_base_ext
{
p.assign_sink(-1);
}
+
+ std::array<int, 4> get_used_handles()
+ {
+ const auto pp1 = p1 != -1 ? p1 : p2;
+ const auto pp2 = p2 != -1 ? p2 : p1;
+
+ return {sink, source, pp1, pp2};
+ }
template<typename Executor>
void on_error(Executor &, const std::error_code &) const
@@ -66,7 +74,7 @@ void pipe_out<2,-1>::on_exec_setup(Executor &e) const
if (::dup2(sink, STDERR_FILENO) == -1)
e.set_error(::boost::process::detail::get_last_error(), "dup2() failed");
- if (sink != STDOUT_FILENO)
+ if (sink != STDERR_FILENO)
::close(sink);
::close(source);
}
@@ -81,6 +89,7 @@ void pipe_out<1,2>::on_exec_setup(Executor &e) const
e.set_error(::boost::process::detail::get_last_error(), "dup2() failed");
if ((sink != STDOUT_FILENO) && (sink != STDERR_FILENO))
::close(sink);
+ ::close(source);
}
class async_pipe;
diff --git a/boost/process/detail/used_handles.hpp b/boost/process/detail/used_handles.hpp
index 4d56af3..5d71dc3 100644
--- a/boost/process/detail/used_handles.hpp
+++ b/boost/process/detail/used_handles.hpp
@@ -61,6 +61,9 @@ struct foreach_handle_invocator
template<typename Executor, typename Function>
void foreach_used_handle(Executor &exec, Function &&func)
{
+#if defined(BOOST_POSIX_API)
+ func(exec.error_sink());
+#endif
boost::fusion::for_each(boost::fusion::filter_if<does_use_handle<boost::mpl::_>>(exec.seq),
foreach_handle_invocator<Function>(func));
}
diff --git a/boost/process/detail/windows/handles.hpp b/boost/process/detail/windows/handles.hpp
index 7a93ac2..f120ef7 100644
--- a/boost/process/detail/windows/handles.hpp
+++ b/boost/process/detail/windows/handles.hpp
@@ -139,10 +139,14 @@ struct limit_handles_ : handler_base_ext
::boost::winapi::DWORD_ flags = 0u;
if (itr != all_handles.end())
*itr = ::boost::winapi::INVALID_HANDLE_VALUE_;
- else if ((::boost::winapi::GetHandleInformation(*itr, &flags) != 0)
- &&((flags & ::boost::winapi::HANDLE_FLAG_INHERIT_) == 0)) //it is NOT inherited anyhow, so ignore too
- *itr = ::boost::winapi::INVALID_HANDLE_VALUE_;
});
+ for (auto& h : all_handles) {
+ ::boost::winapi::DWORD_ flags = 0u;
+ if ((h != ::boost::winapi::INVALID_HANDLE_VALUE_)
+ && (::boost::winapi::GetHandleInformation(h, &flags) != 0)
+ && ((flags & ::boost::winapi::HANDLE_FLAG_INHERIT_) == 0)) //it is NOT inherited anyhow, so ignore too
+ h = ::boost::winapi::INVALID_HANDLE_VALUE_;
+ }
auto part_itr = std::partition(all_handles.begin(), all_handles.end(),
[](::boost::winapi::HANDLE_ handle) {return handle != ::boost::winapi::INVALID_HANDLE_VALUE_;});
--
2.36.1.windows.1

View File

@@ -1,9 +1,14 @@
include(ExternalProject)
# Use boost 1.78 for Windows, to support VS2022
if (WIN32)
set(_boost_url "https://boostorg.jfrog.io/artifactory/main/release/1.78.0/source/boost_1_78_0.tar.gz")
set(_boost_hash 94CED8B72956591C4775AE2207A9763D3600B30D9D7446562C552F0A14A63BE7)
set(_bootstrap_cmd bootstrap.bat)
set(_build_cmd b2.exe)
else()
set(_boost_url "https://boostorg.jfrog.io/artifactory/main/release/1.75.0/source/boost_1_75_0.tar.gz")
set(_boost_hash AEB26F80E80945E82EE93E5939BAEBDCA47B9DEE80A07D3144BE1E1A6A66DD6A)
set(_bootstrap_cmd ./bootstrap.sh)
set(_build_cmd ./b2)
endif()
@@ -28,6 +33,9 @@ elseif (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
elseif (MSVC_VERSION LESS 1930)
# 1920-1929 = VS 16.0 (v142 toolset)
set(_boost_toolset "msvc-14.2")
elseif (MSVC_VERSION LESS 1940)
# 1930-1939 = VS 17.0 (v143 toolset)
set(_boost_toolset "msvc-14.3")
else ()
message(FATAL_ERROR "Unsupported MSVC version")
endif ()
@@ -144,8 +152,8 @@ if (NOT IS_CROSS_COMPILE OR NOT APPLE OR BUILD_SHARED_LIBS)
message(STATUS "Standard boost build with install command '${_install_cmd}'")
ExternalProject_Add(
dep_Boost
URL "https://boostorg.jfrog.io/artifactory/main/release/1.75.0/source/boost_1_75_0.tar.gz"
URL_HASH SHA256=aeb26f80e80945e82ee93e5939baebdca47b9dee80a07d3144be1e1a6a66dd6a
URL ${_boost_url}
URL_HASH SHA256=${_boost_hash}
DOWNLOAD_DIR ${DEP_DOWNLOAD_DIR}/Boost
CONFIGURE_COMMAND "${_bootstrap_cmd}"
PATCH_COMMAND ${_patch_command}
@@ -158,8 +166,8 @@ else()
ExternalProject_Add(
dep_Boost
URL "https://boostorg.jfrog.io/artifactory/main/release/1.75.0/source/boost_1_75_0.tar.gz"
URL_HASH SHA256=aeb26f80e80945e82ee93e5939baebdca47b9dee80a07d3144be1e1a6a66dd6a
URL ${_boost_url}
URL_HASH SHA256=${_boost_hash}
DOWNLOAD_DIR ${DEP_DOWNLOAD_DIR}/Boost
CONFIGURE_COMMAND ./bootstrap.sh
--with-toolset=clang

18
deps/CMakeLists.txt vendored
View File

@@ -1,12 +1,12 @@
#
# This CMake project downloads, configures and builds BambuStudio dependencies on Unix and Windows.
# This CMake project downloads, configures and builds OrcaSlicer dependencies on Unix and Windows.
#
# When using this script, it's recommended to perform an out-of-source build using CMake.
#
# All the dependencies are installed in a `destdir` directory in the root of the build directory,
# in a traditional Unix-style prefix structure. The destdir can be used directly by CMake
# when building BambuStudio - to do this, set the CMAKE_PREFIX_PATH to ${destdir}/usr/local.
# Warning: On UNIX/Linux, you also need to set -DSLIC3R_STATIC=1 when building BambuStudio.
# when building OrcaSlicer - to do this, set the CMAKE_PREFIX_PATH to ${destdir}/usr/local.
# Warning: On UNIX/Linux, you also need to set -DSLIC3R_STATIC=1 when building OrcaSlicer.
#
# For better clarity of console output, it's recommended to _not_ use a parallelized build
# for the top-level command, ie. use `make -j 1` or `ninja -j 1` to force single-threaded top-level
@@ -20,7 +20,7 @@
# therefore, unfortunatelly, the installation cannot be copied/moved elsewhere without re-installing wxWidgets.
#
project(BambuStudio-deps)
project(OrcaSlicer-deps)
cmake_minimum_required(VERSION 3.2)
include(ExternalProject)
@@ -38,6 +38,10 @@ option(DEP_DEBUG "Build debug variants (only applicable on Windows)" ON)
if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
option(DEP_WX_GTK3 "Build wxWidgets against GTK3" OFF)
else()
if(POLICY CMP0135) # DOWNLOAD_EXTRACT_TIMESTAMP
cmake_policy(SET CMP0135 NEW)
endif()
endif()
set(IS_CROSS_COMPILE FALSE)
@@ -65,9 +69,9 @@ endif ()
# Slic3r compiles with a different version which will cause runtime errors.
# option(DEP_BUILD_IGL_STATIC "Build IGL as a static library. Might cause link errors and increase binary size." OFF)
message(STATUS "BambuStudio deps DESTDIR: ${DESTDIR}")
message(STATUS "BambuStudio dowload dir for source packages: ${DEP_DOWNLOAD_DIR}")
message(STATUS "BambuStudio deps debug build: ${DEP_DEBUG}")
message(STATUS "OrcaSlicer deps DESTDIR: ${DESTDIR}")
message(STATUS "OrcaSlicer dowload dir for source packages: ${DEP_DOWNLOAD_DIR}")
message(STATUS "OrcaSlicer deps debug build: ${DEP_DEBUG}")
find_package(Git REQUIRED)

14
deps/JPEG/JPEG.cmake vendored
View File

@@ -1,3 +1,16 @@
if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
if (JPEG_VERSION STREQUAL "6")
message("Using Jpeg Lib 62")
set(jpeg_flag "")
elseif (JPEG_VERSION STREQUAL "7")
message("Using Jpeg Lib 70")
set(jpeg_flag "-DWITH_JPEG7=ON")
else ()
message("Using Jpeg Lib 80")
set(jpeg_flag "-DWITH_JPEG8=ON")
endif ()
endif()
bambustudio_add_cmake_project(JPEG
URL https://github.com/libjpeg-turbo/libjpeg-turbo/archive/refs/tags/2.0.6.zip
URL_HASH SHA256=017bdc33ff3a72e11301c0feb4657cb27719d7f97fa67a78ed506c594218bbf1
@@ -5,4 +18,5 @@ bambustudio_add_cmake_project(JPEG
CMAKE_ARGS
-DENABLE_SHARED=OFF
-DENABLE_STATIC=ON
${jpeg_flag}
)

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,149 @@
// Copyright (C) Microsoft Corporation. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef __core_webview2_environment_options_h__
#define __core_webview2_environment_options_h__
#include <objbase.h>
#include <wrl/implements.h>
#include "webview2.h"
#define CORE_WEBVIEW_TARGET_PRODUCT_VERSION L"107.0.1418.22"
#define COREWEBVIEW2ENVIRONMENTOPTIONS_STRING_PROPERTY(p) \
public: \
HRESULT STDMETHODCALLTYPE get_##p(LPWSTR* value) override { \
if (!value) \
return E_POINTER; \
*value = m_##p.Copy(); \
if ((*value == nullptr) && (m_##p.Get() != nullptr)) \
return HRESULT_FROM_WIN32(GetLastError()); \
return S_OK; \
} \
HRESULT STDMETHODCALLTYPE put_##p(LPCWSTR value) override { \
LPCWSTR result = m_##p.Set(value); \
if ((result == nullptr) && (value != nullptr)) \
return HRESULT_FROM_WIN32(GetLastError()); \
return S_OK; \
} \
\
protected: \
AutoCoMemString m_##p;
#define COREWEBVIEW2ENVIRONMENTOPTIONS_BOOL_PROPERTY(p) \
public: \
HRESULT STDMETHODCALLTYPE get_##p(BOOL* value) override { \
if (!value) \
return E_POINTER; \
*value = m_##p; \
return S_OK; \
} \
HRESULT STDMETHODCALLTYPE put_##p(BOOL value) override { \
m_##p = value; \
return S_OK; \
} \
\
protected: \
BOOL m_##p = FALSE;
// This is a base COM class that implements ICoreWebView2EnvironmentOptions.
template <typename allocate_fn_t,
allocate_fn_t allocate_fn,
typename deallocate_fn_t,
deallocate_fn_t deallocate_fn>
class CoreWebView2EnvironmentOptionsBase
: public Microsoft::WRL::Implements<
Microsoft::WRL::RuntimeClassFlags<Microsoft::WRL::ClassicCom>,
ICoreWebView2EnvironmentOptions,
ICoreWebView2EnvironmentOptions2> {
public:
CoreWebView2EnvironmentOptionsBase() {
// Initialize the target compatible browser version value to the version of
// the browser binaries corresponding to this version of the SDK.
m_TargetCompatibleBrowserVersion.Set(CORE_WEBVIEW_TARGET_PRODUCT_VERSION);
}
protected:
~CoreWebView2EnvironmentOptionsBase() {}
class AutoCoMemString {
public:
AutoCoMemString() {}
~AutoCoMemString() { Release(); }
void Release() {
if (m_string) {
deallocate_fn(m_string);
m_string = nullptr;
}
}
LPCWSTR Set(LPCWSTR str) {
Release();
if (str) {
m_string = MakeCoMemString(str);
}
return m_string;
}
LPCWSTR Get() { return m_string; }
LPWSTR Copy() {
if (m_string)
return MakeCoMemString(m_string);
return nullptr;
}
protected:
LPWSTR MakeCoMemString(LPCWSTR source) {
const size_t length = wcslen(source);
const size_t bytes = (length + 1) * sizeof(*source);
// Ensure we didn't overflow during our size calculation.
if (bytes <= length) {
return nullptr;
}
wchar_t* result = reinterpret_cast<wchar_t*>(allocate_fn(bytes));
if (result)
memcpy(result, source, bytes);
return result;
}
LPWSTR m_string = nullptr;
};
// ICoreWebView2EnvironmentOptions
COREWEBVIEW2ENVIRONMENTOPTIONS_STRING_PROPERTY(AdditionalBrowserArguments)
COREWEBVIEW2ENVIRONMENTOPTIONS_STRING_PROPERTY(Language)
COREWEBVIEW2ENVIRONMENTOPTIONS_STRING_PROPERTY(TargetCompatibleBrowserVersion)
COREWEBVIEW2ENVIRONMENTOPTIONS_BOOL_PROPERTY(
AllowSingleSignOnUsingOSPrimaryAccount)
// ICoreWebView2EnvironmentOptions2
COREWEBVIEW2ENVIRONMENTOPTIONS_BOOL_PROPERTY(ExclusiveUserDataFolderAccess)
};
template <typename allocate_fn_t,
allocate_fn_t allocate_fn,
typename deallocate_fn_t,
deallocate_fn_t deallocate_fn>
class CoreWebView2EnvironmentOptionsBaseClass
: public Microsoft::WRL::RuntimeClass<
Microsoft::WRL::RuntimeClassFlags<Microsoft::WRL::ClassicCom>,
CoreWebView2EnvironmentOptionsBase<allocate_fn_t,
allocate_fn,
deallocate_fn_t,
deallocate_fn>> {
public:
CoreWebView2EnvironmentOptionsBaseClass() {}
protected:
~CoreWebView2EnvironmentOptionsBaseClass() override {}
};
typedef CoreWebView2EnvironmentOptionsBaseClass<decltype(&::CoTaskMemAlloc),
::CoTaskMemAlloc,
decltype(&::CoTaskMemFree),
::CoTaskMemFree>
CoreWebView2EnvironmentOptions;
#endif // __core_webview2_environment_options_h__

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -14,6 +14,22 @@ index 0bc4f934b9..479431a69c 100644
find_package(WAYLANDEGL)
if(WAYLANDEGL_FOUND AND wxHAVE_GDK_WAYLAND)
list(APPEND OPENGL_LIBRARIES ${WAYLANDEGL_LIBRARIES})
diff --git a/build/cmake/lib/webview/CMakeLists.txt b/build/cmake/lib/webview/CMakeLists.txt
index cc3298ff33..8adbeaea4f 100644
--- a/build/cmake/lib/webview/CMakeLists.txt
+++ b/build/cmake/lib/webview/CMakeLists.txt
@@ -56,7 +56,7 @@ if(APPLE)
elseif(WXMSW)
if(wxUSE_WEBVIEW_EDGE)
# Update the following variables if updating WebView2 SDK
- set(WEBVIEW2_VERSION "1.0.705.50")
+ set(WEBVIEW2_VERSION "1.0.1418.22")
set(WEBVIEW2_URL "https://www.nuget.org/api/v2/package/Microsoft.Web.WebView2/${WEBVIEW2_VERSION}")
- set(WEBVIEW2_SHA256 "6a34bb553e18cfac7297b4031f3eac2558e439f8d16a45945c22945ac404105d")
+ set(WEBVIEW2_SHA256 "51d2ef56196e2a9d768a6843385bcb9c6baf9ed34b2603ddb074fb4995543a99")
set(WEBVIEW2_DEFAULT_PACKAGE_DIR "${CMAKE_BINARY_DIR}/packages/Microsoft.Web.WebView2.${WEBVIEW2_VERSION}")
diff --git a/include/wx/fontutil.h b/include/wx/fontutil.h
index 09ad8c8ef3..3c0c2d8f7e 100644
--- a/include/wx/fontutil.h

View File

@@ -1,15 +1,13 @@
set(_wx_git_tag v3.1.5)
set(_wx_toolkit "")
if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
set(_wx_private_font "-DwxUSE_PRIVATE_FONTS=1")
if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
set(_gtk_ver 2)
if (DEP_WX_GTK3)
set(_gtk_ver 3)
endif ()
set(_wx_toolkit "-DwxBUILD_TOOLKIT=gtk${_gtk_ver}")
set(_wx_private_font "-DwxUSE_PRIVATE_FONTS=1")
else ()
set(_wx_private_font "-DwxUSE_PRIVATE_FONTS=0")
endif()
if (MSVC)
@@ -19,7 +17,7 @@ else ()
endif ()
if (MSVC)
set(_patch_cmd ${PATCH_CMD} ${CMAKE_CURRENT_LIST_DIR}/0001-wxWidget-fix.patch)
set(_patch_cmd if not exist WXWIDGETS_PATCHED ( "${GIT_EXECUTABLE}" apply --verbose --ignore-space-change --whitespace=fix ${CMAKE_CURRENT_LIST_DIR}/0001-wxWidget-fix.patch && type nul > WXWIDGETS_PATCHED ) )
else ()
set(_patch_cmd test -f WXWIDGETS_PATCHED || ${PATCH_CMD} ${CMAKE_CURRENT_LIST_DIR}/0001-wxWidget-fix.patch && touch WXWIDGETS_PATCHED)
endif ()
@@ -28,8 +26,8 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
set(_patch_cmd ${PATCH_CMD} ${CMAKE_CURRENT_LIST_DIR}/0001-wxWidget-fix.patch)
endif ()
bambustudio_add_cmake_project(wxWidgets
bambustudio_add_cmake_project(
wxWidgets
GIT_REPOSITORY "https://github.com/wxWidgets/wxWidgets"
GIT_TAG ${_wx_git_tag}
PATCH_COMMAND ${_patch_cmd}

92
doc/Calibration.md Normal file
View File

@@ -0,0 +1,92 @@
- [Flow rate](#Flow-rate)
- [Pressure Advance](#Pressure-Advance)
1. [Line method](#Line-method)
2. [Tower method](#Tower-method)
- [Temp tower](#Temp-tower)
- [Retraction test](#Retraction-test)
- [Orca Tolerance Test](#Orca-Tolerance-Test)
- [Advanced calibration]
1. [Max Volumetric speed]
2. [VFA]
**NOTE**: After completing the calibration process, remember to create a new project in order to exit the calibration mode.
# Flow rate
##### *NOTE: For Bambulab X1/X1C users, make sure you do not select the 'Flow calibration' option.*
![uncheck](https://user-images.githubusercontent.com/103989404/221345187-3c317a46-4d85-4221-99b9-adb5c7f48026.jpeg)
----------------------------------------
![flowrate](https://user-images.githubusercontent.com/103989404/210137579-3fd141ad-f2da-4542-a1fd-fc4b4d673908.gif)
Calibrating the flow rate involves a two-step process.
Steps
1. Select the printer, filament, and process you would like to use for the test.
2. Select `Pass 1` in the `Calibration` menu
3. A new project consisting of nine blocks will be created, each with a different flow rate modifier. Slice and print the project.
4. Examine the blocks and determine which one has the smoothest top surface.
![flowrate-pass1_resize](https://user-images.githubusercontent.com/103989404/210138585-98821729-b19e-4452-a08d-697f147d36f0.jpg)
![0-5](https://user-images.githubusercontent.com/103989404/210138714-63daae9c-6778-453a-afa9-9a976d61bfd5.jpg)
5. Update the flow ratio in the filament settings using the following equation: `FlowRatio_old*(100 + modifier)/100`. If your previous flow ratio was `0.98` and you selected the block with a flow rate modifier of `+5`, the new value should be calculated as follows: `0.98x(100+5)/100 = 1.029`. ** Remember** to save the filament profile.
6. Perform the `Pass 2` calibration. This process is similar to `Pass 1`, but a new project with ten blocks will be generated. The flow rate modifiers for this project will range from `-9 to 0`.
7. Repeat steps 4 and 5. In this case, if your previous flow ratio was 1.029 and you selected the block with a flow rate modifier of -6, the new value should be calculated as follows: `1.029x(100-6)/100 = 0.96726`. ** Remember ** to save the filament profile.
![pass2](https://user-images.githubusercontent.com/103989404/210139072-f2fa91a6-4e3b-4d2a-81f2-c50155e1ff6d.jpg)
![-6](https://user-images.githubusercontent.com/103989404/210139131-ee224146-b242-4c1c-ac96-35ef0ca591f1.jpg)
![image](https://user-images.githubusercontent.com/103989404/210139721-919be130-fbba-4e3a-aa58-8a563e8c7792.png)
# Pressure Advance
I will present two approaches for calibrating the pressure advance value. Both methods have their own advantages and disadvantages. It is important to note that each method has two versions: one for a direct drive extruder and one for a Bowden extruder. Make sure to select the appropriate version for your test.
##### *NOTE: For Bambulab X1/X1C users, make sure you do not select the 'Flow calibration' option.*
![uncheck](https://user-images.githubusercontent.com/103989404/221345187-3c317a46-4d85-4221-99b9-adb5c7f48026.jpeg)
### Line method
The line method is quick and straightforward to test. However, its accuracy highly depends on your first layer quality. It is suggested to turn on the bed mesh leveling for this test.
Steps:
1. Select the printer, filament, and process you would like to use for the test.
2. Print the project and check the result. You can select the value of the most even line and update your PA value in the filament settings.
3. In this test, a PA value of `0.016` appears to be optimal.
![pa_line](https://user-images.githubusercontent.com/103989404/210139630-8fd189e7-aa6e-4d03-90ab-84ab0e781f81.gif)
<img width="1003" alt="Screenshot 2022-12-31 at 12 11 10 PM" src="https://user-images.githubusercontent.com/103989404/210124449-dd828da8-a7e4-46b8-9fa2-8bed5605d9f6.png">
![line_0 016](https://user-images.githubusercontent.com/103989404/210140046-dc5adf6a-42e8-48cd-950c-5e81558da967.jpg)
![image](https://user-images.githubusercontent.com/103989404/210140079-61a4aba4-ae01-4988-9f8e-2a45a90cdb7d.png)
### Tower method
The tower method may take a bit more time to complete, but it does not rely on the quality of the first layer.
The PA value for this test will be increased by 0.002 for every 1 mm increase in height. (**NOTE** 0.02 for Bowden)
Steps:
1. Select the printer, filament, and process you would like to use for the test.
2. Examine each corner of the print and mark the height that yields the best overall result.
3. I selected a height of 8 mm for this case, so the pressure advance value should be calculated as `0.002x8 = 0.016`.
![tower](https://user-images.githubusercontent.com/103989404/210140231-e886b98d-280a-4464-9781-c74ed9b7d44e.jpg)
![tower_measure](https://user-images.githubusercontent.com/103989404/210140232-885b549b-e3b8-46b9-a24c-5229c9182408.jpg)
# Temp tower
![image](./images/temp_tower_test.gif)
Temp tower is a straightforward test. The temp tower is a vertical tower with multiple blocks, each printed at a different temperature. Once the print is complete, we can examine each block of the tower and determine the optimal temperature for the filament. The optimal temperature is the one that produces the highest quality print with the least amount of issues, such as stringing, layer adhesion, warping (overhang), and bridging.
![temp_tower](https://user-images.githubusercontent.com/103989404/221344534-40e1a629-450c-4ad5-a051-8e240e261a51.jpeg)
# Retraction test
![image](./images/retraction_test.gif)
This test generates a retraction tower automatically. The retraction tower is a vertical structure with multiple notches, each printed at a different retraction length. After the print is complete, we can examine each section of the tower to determine the optimal retraction length for the filament. The optimal retraction length is the shortest one that produces the cleanest tower.
![image](./images/retraction_test_dlg.png)
In the dialog, you can select the start and end retraction length, as well as the retraction length increment step. The default values are 0mm for the start retraction length, 2mm for the end retraction length, and 0.1mm for the step. These values are suitable for most direct drive extruders. However, for Bowden extruders, you may want to increase the start and end retraction lengths to 1mm and 6mm, respectively, and set the step to 0.2mm.
**Note**: When testing filaments such as PLA or ABS that have minimal oozing, the retraction settings can be highly effective. You may find that the retraction tower appears clean right from the start. In such situations, setting the retraction length to 0.2mm - 0.4mm using Orca Slicer should suffice.
On the other hand, if there is still a lot of stringing at the top of the tower, it is recommended to dry your filament and ensure that your nozzle is properly installed without any leaks.
![image](./images/retraction_test_print.jpg)
# Orca Tolerance Test
This tolerance test is specifically designed to assess the dimensional accuracy of your printer and filament. The model comprises a base and a hexagon tester. The base contains six hexagon hole, each with a different tolerance: 0.0mm, 0.05mm, 0.1mm, 0.2mm, 0.3mm, and 0.4mm. The dimensions of the hexagon tester are illustrated in the image.
![image](./images/tolerance_hole.jpg)
You can assess the tolerance using either an M6 Allen key or the printed hexagon tester.
![image](./images/OrcaToleranceTes_m6.jpg)
![image](./images/OrcaToleranceTest_print.jpg)
***
*Credits:*
- *The Flowrate test and retraction test is inspired by [SuperSlicer](https://github.com/supermerill/SuperSlicer)*
- *The PA Line method is inspired by [K-factor Calibration Pattern](https://marlinfw.org/tools/lin_advance/k-factor.html)*
- *The PA Tower method is inspired by [Klipper](https://www.klipper3d.org/Pressure_Advance.html)*
- *The temp tower model is remixed from [Smart compact temperature calibration tower](https://www.thingiverse.com/thing:2729076)
- *The max flowrate test was inspired by Stefan(CNC Kitchen), and the model used in the test is a remix of his [Extrusion Test Structure](https://www.printables.com/model/342075-extrusion-test-structure).
- *chapgpt* ;)

7
doc/Home.md Normal file
View File

@@ -0,0 +1,7 @@
Welcome to the OrcaSlicer WIKI!
We have divided it roughly into the following pages:
* [Calibration](wiki/Calibration)
* [Seam](wiki/Seam)
* [How to build Orca Slicer](wiki/How-to-build)

11
doc/How to build Normal file
View File

@@ -0,0 +1,11 @@
# How to compile
- Windows 64-bit
- Tools needed: Visual Studio 2019, Cmake, git, Strawberry Perl.
- Run `build_release.bat` in `x64 Native Tools Command Prompt for VS 2019`
- Mac 64-bit
- Tools needed: Xcode, Cmake, git, gettext
- run `build_release_macos.sh`
- Ubuntu
- run `BuildLinux.sh -udisr`

View File

@@ -1,4 +0,0 @@
# Building Bambu Studio on UNIX/Linux
Currently Linux version is not verified, you can try it referring to [PrusaSlicer'S linux building guide](https://github.com/prusa3d/PrusaSlicer/blob/master/doc/How%20to%20build%20-%20Linux%20et%20al.md)

View File

@@ -1,41 +0,0 @@
# Building Bambu Studio on Mac OS
## Enviroment setup
Install Following tools:
- Xcode from app store
- Cmake
- git
- gettext
Cmake, git, gettext can be installed from brew(brew install cmake git gettext)
## building the deps
You need to build the dependence of BambuStudio first. (Only needs for the first time)
Suppose you download the codes into /Users/_username_/work/projects/BambuStudio
create a directory to store the dependence built: /Users/_username_/work/projects/BambuStudio_dep
**(Please make sure to replace the username with the one on your computer)**
`cd BambuStudio/deps`
`mkdir build;cd build`
for arm64 architecture
`cmake ../ -DDESTDIR="/Users/username/work/projects/BambuStudio_dep" -DOPENSSL_ARCH="darwin64-arm64-cc"`
for x86 architeccture
`cmake ../ -DDESTDIR="/Users/username/work/projects/BambuStudio_dep" -DOPENSSL_ARCH="darwin64-x86_64-cc"`
`make -jN` (N can be a number between 1 and the max cpu number)
## building the Bambu Studio
create a directory to store the installed files at /Users/username/work/projects/BambuStudio/install_dir
`cd BambuStudio`
`mkdir install_dir`
`mkdir build;cd build`
building it use cmake
`cmake .. -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="/Users/username/work/projects/BambuStudio_dep/usr/local" -DCMAKE_INSTALL_PREFIX="../install_dir" -DCMAKE_BUILD_TYPE=Release -DCMAKE_MACOSX_RPATH=ON -DCMAKE_INSTALL_RPATH="/Users/username/work/projects/BambuStudio_dep/usr/local" -DCMAKE_MACOSX_BUNDLE=on`
`cmake --build . --target install --config Release -jN`
building it use xcode
`cmake .. -GXcode -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="/Users/username/work/projects/BambuStudio_dep/usr/local" -DCMAKE_INSTALL_PREFIX="../install_dir" -DCMAKE_BUILD_TYPE=Release -DCMAKE_MACOSX_RPATH=ON -DCMAKE_INSTALL_RPATH="/Users/username/work/projects/BambuStudio_dep/usr/local" -DCMAKE_MACOSX_BUNDLE=on`
then building it using Xcode

View File

@@ -1,36 +0,0 @@
# Building Bambu Studio on Windows
## Enviroment setup
Install Following tools:
- Visual Studio Community 2019 from [visualstudio.microsoft.com/vs/](https://visualstudio.microsoft.com/vs/) (Older versions are not supported as Bambu Studio requires support for C++17, and newer versions should also be ok);
- Cmake from [cmake.org](https://cmake.org/download/)
- Git from [gitforwindows.org](https://gitforwindows.org/)
- Perl from [strawberryperl](https://strawberryperl.com/)
## building the deps
Suppose you download the codes into D:/work/Projects/BambuStudio
create a directory to store the dependence built: D:/work/Projects/BambuStudio_dep
`cd BambuStudio/deps`
`mkdir build;cd build`
`cmake ../ -G "Visual Studio 16 2019" -DDESTDIR="D:/work/Projects/BambuStudio_dep" -DCMAKE_BUILD_TYPE=Release`
`msbuild /m ALL_BUILD.vcxproj`
It takes "00:14:27.37" to finish it on my machine (11th Gen Intel(R) Core(TM) i9-11900 @2.50GHz 2.50 GHz, with 32.0 GB DDR)
## building the Bambu Studio
create a directory to store the installed files at D:/work/Projects/BambuStudio/install_dir
`cd BambuStudio`
`mkdir install_dir`
`mkdir build;cd build`
set -DWIN10SDK_PATH to your windows sdk path(for example: C:/Program Files (x86)/Windows Kits/10/Include/10.0.19041.0) in below command:
`cmake .. -G "Visual Studio 16 2019" -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="D:/work/Projects/BambuStudio_dep/usr/local" -DCMAKE_INSTALL_PREFIX="../install_dir" -DCMAKE_BUILD_TYPE=Release -DWIN10SDK_PATH="C:/Program Files (x86)/Windows Kits/10/Include/10.0.19041.0"`
then build it using command
`cmake --build . --target install --config Release`
or building it under the Visual Studio 2019
(set the BambuStudio_app_gui as start project)
![image](https://user-images.githubusercontent.com/106916061/179185940-06135b47-f2a4-415a-9be4-666680fa0f9a.png)

View File

@@ -1,6 +1,6 @@
# Localization and translation guide
The purpose of this guide is to describe how to contribute to the Bambu Studio translations. We use GNUgettext for extracting string resources from the project and PoEdit for editing translations.
The purpose of this guide is to describe how to contribute to the Orca Slicer translations. We use GNUgettext for extracting string resources from the project and PoEdit for editing translations.
Those can be downloaded here:
- https://sourceforge.net/directory/os:windows/?q=gnu+gettext GNUgettext package contains a set of tools to extract strings from the source code and to create the translation Catalog.
@@ -32,15 +32,15 @@ Notice. When the translation is complete you need to:
- copy BambuStudio_xx.mo into resources/i18n/xx and rename it to BambuStudio.mo, then push the changed file.
( name of folder "fr" means "French" - the translation language).
### Scenario 3. How do I add a new text resource when implementing a feature to Bambu Studio
Each string resource in Bambu Studio available for translation needs to be explicitly marked using L() macro like this:
### Scenario 3. How do I add a new text resource when implementing a feature to Orca Slicer
Each string resource in Orca Slicer available for translation needs to be explicitly marked using L() macro like this:
```C++
auto msg = L("This message to be localized")
```
To get translated text use one of needed macro/function (`_(s)` or `_CHB(s)` ).
If you add new file resource, add it to the list of files containing macro `L()`
### Scenario 4. How do I use GNUgettext to localize my own application taking Bambu Studio as an example
### Scenario 4. How do I use GNUgettext to localize my own application taking Orca Slicer as an example
1. For convenience create a list of files with this macro `L(s)`. We have
https://github.com/bambulab/BambuStudio/blob/master/bbl/i18n/list.txt.
@@ -75,14 +75,14 @@ https://github.com/bambulab/BambuStudio/blob/master/bbl/i18n/list.txt.
When you have Catalog to translation open POT or PO file in PoEdit and start translating.
## General guidelines for Bambu Studio translators
## General guidelines for Orca Slicer translators
- We recommend using *PoEdit* application for translation (as described above). It will help you eliminate most punctuation errors and will show you strings with "random" translations (if the fuzzy parameter was used).
- To check how the translated text looks on the UI elements, test it :) If you use *PoEdit*, all you need to do is save the file. At this point, a MO file will be created. Rename it Bambu Studio.mo, and you can run Bambu Studio (see above).
- To check how the translated text looks on the UI elements, test it :) If you use *PoEdit*, all you need to do is save the file. At this point, a MO file will be created. Rename it Orca Slicer.mo, and you can run Orca Slicer (see above).
- If you see an encoding error (garbage characters instead of Unicode) somewhere in Bambu Studio, report it. It is likely not a problem of your translation, but a bug in the software.
- If you see an encoding error (garbage characters instead of Unicode) somewhere in Orca Slicer, report it. It is likely not a problem of your translation, but a bug in the software.
- See on which UI elements the translated phrase will be used. Especially if it's a button, it is very important to decide on the translation and not write alternative translations in parentheses, as this will significantly increase the width of the button, which is sometimes highly undesirable:

17
doc/Seam.md Normal file
View File

@@ -0,0 +1,17 @@
WIP...
### Seam gap
![image](https://user-images.githubusercontent.com/103989404/215331359-236874c9-ca91-4dd4-b969-3cefc70ebe1b.png)
### Role-based wipe speed(auto)
### Wipe speed
### Wipe on loop(inward movement)
![image](https://user-images.githubusercontent.com/103989404/215334479-2687c518-1931-46a9-a363-7ae57a0aecf6.png)
Use outer wall speed and acceleration instead of travel speed and acceleration.
Added an option to disable this feature
### Support Cura style outer wall wipe(100% retract before wipe)
![image](https://user-images.githubusercontent.com/103989404/215334900-97c75010-4752-45f1-a57c-f0b723a8cb3f.png)
![image](https://user-images.githubusercontent.com/103989404/215335212-3253061d-bb7b-4853-a86c-10ff54cc8df5.png)
Extra length on restart

Binary file not shown.

After

Width:  |  Height:  |  Size: 21 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 178 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 44 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 224 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.2 KiB

View File

@@ -1,18 +0,0 @@
**新功能**
1. 3D文字工具
2. 对象和拷贝间的数据共享
3. 参数表格
4. 用户指南
5. 支持Arachne特性
**改进**
1. 支持导出通用的3mf格式兼容其他切片软件
2. 优化混合支撑和树状支撑的生成速度
3. 支持不停靠工具头的延迟摄影
4. 支持纹理PEI热床
5. 支持导入和导出预设
6. 支持随机位置的接缝设置
7. 支持匈牙利语
8. 一些关键问题修复
详细信息请查看https://github.com/bambulab/BambuStudio/releases

View File

@@ -1,18 +0,0 @@
**New Features**
1. 3D text tool
2. Shared data between an object and its copies
3. Parameter table
4. User manual
5. Arachne feature
**Improvements**
1. Added support for exporting generic 3mf that is compatible with other slicers
2. Optimized the performance of hybrid and tree support
3. Added traditional timelapse mode
4. Added support for Textured PEI plate
5. Added support for export/import preset
6. Added random seam position
7. Added Magyar translations
8. Fixed some known bugs
For details, please check https://github.com/bambulab/BambuStudio/releases

View File

@@ -105,7 +105,7 @@ sub copyright_info
my (%params) = @_;
my %tag = Slic3r::tags($params{format});
my $out =
'Copyright &copy; Bambu Studio.';
'Copyright &copy; Orca Slicer.';
return $out;
}

View File

@@ -6,38 +6,43 @@
"files": [
{
"type": "po",
"pattern": "bbl/i18n/en/BambuStudio_en.po",
"pattern": "bbl/i18n/en/OrcaSlicer_en.po",
"lang": "en"
},
{
"type": "po",
"pattern": "bbl/i18n/fr/BambuStudio_fr.po",
"pattern": "bbl/i18n/fr/OrcaSlicer_fr.po",
"lang": "fr"
},
{
"type": "po",
"pattern": "bbl/i18n/de/BambuStudio_de.po",
"pattern": "bbl/i18n/de/OrcaSlicer_de.po",
"lang": "de"
},
{
"type": "po",
"pattern": "bbl/i18n/sv/BambuStudio_sv.po",
"pattern": "bbl/i18n/sv/OrcaSlicer_sv.po",
"lang": "sv"
},
{
"type": "po",
"pattern": "bbl/i18n/es/BambuStudio_es.po",
"pattern": "bbl/i18n/es/OrcaSlicer_es.po",
"lang": "es"
},
{
"type": "po",
"pattern": "bbl/i18n/nl/BambuStudio_nl.po",
"pattern": "bbl/i18n/nl/OrcaSlicer_nl.po",
"lang": "nl"
},
{
"type": "po",
"pattern": "bbl/i18n/hu/BambuStudio_hu.po",
"pattern": "bbl/i18n/hu/OrcaSlicer_hu.po",
"lang": "hu"
},
{
"type": "po",
"pattern": "bbl/i18n/ja/OrcaSlicer_ja.po",
"lang": "ja"
}
]
},
@@ -45,7 +50,7 @@
"folder": "bbl/i18n",
"includeSourceLang" : "true",
"files": {
"output": "${lang}/BambuStudio_${lang}.po"
"output": "${lang}/OrcaSlicer_${lang}.po"
}
}
}

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
resources/calib/vfa/VFA.stl Normal file

Binary file not shown.

File diff suppressed because it is too large Load Diff

View File

@@ -9,45 +9,44 @@
"FUNC_BUILDPLATE_MARKER_DETECT": false,
"FUNC_FLOW_CALIBRATION": false,
"FUNC_MONITORING": false,
"FUNC_TIMELAPSE": false,
"FUNC_MEDIA_FILE": false,
"FUNC_REMOTE_TUNNEL": false,
"FUNC_LOCAL_TUNNEL": true,
"FUNC_VIRTUAL_CAMERA" : false,
"FUNC_PRINT_WITHOUT_SD": false,
"FUNC_ALTER_RESOLUTION": false,
"FUNC_AUTO_SWITCH_FILAMENT": false,
"FUNC_CHAMBER_FAN" : false,
"FUNC_EXTRUSION_CALI": true,
"FUNC_PRINT_ALL" : false,
"FUNC_CHAMBER_FAN" : false
"FUNC_PRINT_ALL" : false
},
"camera_resolution":["720p"],
"bed_temperature_limit": 120,
"bed_temperature_limit": 100,
"model_id": "C11",
"printer_type": "C11",
"ftp_folder" : "sdcard/",
"printer_thumbnail_image": "printer_thumbnail_p1p"
},
{
{
"display_name": "Bambu Lab X1",
"func": {
"FUNC_VIRTUAL_TYAY" : true,
"FUNC_EXTRUSION_CALI": false,
"FUNC_LOCAL_TUNNEL": false
},
"camera_resolution":["720p","1080p"],
"bed_temperature_limit": 120,
"model_id": "BL-P002",
"camera_resolution":["720p","1080p"],
"printer_type": "3DPrinter-X1",
"printer_thumbnail_image": "printer_thumbnail"
},
{
"display_name": "Bambu Lab X1 Carbon",
"func": {
"FUNC_VIRTUAL_TYAY" : true,
"FUNC_EXTRUSION_CALI": false,
"FUNC_LOCAL_TUNNEL": false
},
"model_id": "BL-P001",
"camera_resolution":["720p","1080p"],
"bed_temperature_limit": 120,
"printer_type": "3DPrinter-X1-Carbon",
"printer_thumbnail_image": "printer_thumbnail"
}

View File

@@ -95,7 +95,7 @@ text = Object List\nDid you know that you can view all objects/parts in a list a
documentation_link = https://wiki.bambulab.com/en/software/bambu-studio/object-list
#[hint:Search Functionality]
#text = Search Functionality\nDid you know that you use the Search tool to quickly find a specific Bambu Studio setting? Or use the familiar shortcut <b>Ctrl+F</b>.
#text = Search Functionality\nDid you know that you use the Search tool to quickly find a specific Orca Slicer setting? Or use the familiar shortcut <b>Ctrl+F</b>.
[hint:Simplify Model]
text = Simplify Model\nDid you know that you can reduce the number of triangles in a mesh using the Simplify mesh feature? Right-click the model and select Simplify model. Read more in the documentation.
@@ -110,11 +110,11 @@ text = Split to Objects/Parts\nDid you know that you can split a big object into
documentation_link = https://wiki.bambulab.com/en/software/bambu-studio/split-to-objects-parts
[hint:Subtract a Part]
text = Subtract a Part\nDid you know that you can subtract one mesh from another using the Negative part modifier? That way you can, for example, create easily resizable holes directly in Bambu Studio. Read more in the documentation.
text = Subtract a Part\nDid you know that you can subtract one mesh from another using the Negative part modifier? That way you can, for example, create easily resizable holes directly in Orca Slicer. Read more in the documentation.
documentation_link = https://wiki.bambulab.com/en/software/bambu-studio/subtract-a-part
[hint:STEP]
text = STEP\nDid you know that you can improve your print quality by slicing a STEP file instead of an STL?\nBambu Studio supports slicing STEP files, providing smoother results than a lower resolution STL. Give it a try!
text = STEP\nDid you know that you can improve your print quality by slicing a STEP file instead of an STL?\nOrca Slicer supports slicing STEP files, providing smoother results than a lower resolution STL. Give it a try!
documentation_link= https://wiki.bambulab.com/en/software/bambu-studio/step
[hint:Z seam location]
@@ -155,7 +155,7 @@ documentation_link= https://wiki.bambulab.com/en/software/bambu-studio/set-param
[hint:Stack objects]
text = Stack objects\nDid you know that you can stack objects as a whole one?
documentation_link= https://wiki.bambulab.com/e/en/software/bambu-studio/stacking-objects
documentation_link= https://wiki.bambulab.com/en/software/bambu-studio/stacking-objects
[hint:Flush into support/objects/infill]
text = Flush into support/objects/infill\nDid you know that you can save the wasted filament by flushing them into support/objects/infill during filament change?

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More