3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-17 03:37:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
3058 commits 18 branches 69 tags 1.8 GiB
Commit graph

69 commits

Author SHA1 Message Date
SoftFever
bdf8c8d5b1 Merge remote-tracking branch 'remote/v1.6.0' 
# Conflicts:
#	.github/workflows/build_ubuntu.yml
#	src/libslic3r/Print.cpp
#	version.inc
 2023-07-07 00:38:54 +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
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
liz.li
d20afab115 FIX: save and load layer_range to 3mf 
Change-Id: Ie18aa8140b5c0fbba87be6ef2f8d0c924fa61791
(cherry picked from commit 6ef824bfbe06c694609c8e69338a3628248b93ac)
 2023-04-27 15:50:47 +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
chunmao.guo
a2386a3c3b FIX: [STUDIO-2617] thread locale when save 3mf model 
Change-Id: I0b76b70922df8ec4fdeec7e15d824b9acd19a63b
 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
zhimin.zeng
e6e0085dcc FIX: the volume position is not correct(3mf from solidwork) 
Change-Id: I69fe3f9896214da502b60bc23deee6525599677e
 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
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
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
chunmao.guo
00a815e507 FIX: use ppath tag in main 3mf model 
Change-Id: I9a91eaa80f4fe5640aec0c954b6b22b144a1812c
 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
tao wang
a86d94f2c9 NEW:update the content of the project page 
Change-Id: Idb7f8a2564c78a1f062580f6b388ee033238cedf
 2023-04-17 15:39:02 +08:00
SoftFever
0d3b84b9d3 Keep project file compatible with BambuStudio 
#599
 2023-04-03 20:04:53 +08:00
SoftFever
f5c4cc9a54 New feature: plate name 2023-03-29 21:36:14 +08:00
SoftFever
11679d6858 fix loading project issue 2023-03-12 12:11:43 +08:00
SoftFever
5b0ba1207e Change Application name to OrcaSlicer 2023-03-12 10:05:22 +08:00
tao.jin
f5e8d70989 FIX: cancel loading .step without warning 
Change-Id: I5274b744c223fbd92dbca669f3d57c01b5558f88
 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
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
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
liz.li
e7ea07944f ENH: custom gcode info should be owned by every plate 
Change-Id: I5e5b000b7d04354d3c3cc311d089cb591a37501e
 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
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
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
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
Zhaofeng Li
0c83c2884b 3mf: Correctly include expat.h 2022-12-16 22:51:07 -05:00
Zhaofeng Li
99043bbb02 Add missing includes for boost::filesystem::load_string_file 
Deprecated in Boost 1.79.0 and no longer included by
filesystem.hpp.
 2022-12-16 22:51:07 -05:00
yifan.wu
f438c2dfcb ENH: remove bbs namespace in 3mf 
Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: Ib9db7bbfb8ebb9c1b29b50f5743c927250f58bef
(cherry picked from commit d7a131b97c72c01b8fc256e179309cfde4f1f8b4)
 2022-12-15 04:38:15 -05:00
lane.wei
f2aaddebb8 FIX: fix the assemble view display issue when enter firstly 
Change-Id: Idf432df9d3bb8eef1d57b08b6d345bc1867fe955
 2022-12-15 04:38:15 -05:00
lane.wei
bf8208241d FIX: fix the object name empty issue 
when loading third party 3mf, sometimes there is no object name
just named these object to 'Object_index'

Change-Id: Ie73f49ffa79e996114b7a2095de4de7d41bfec24
 2022-12-15 04:38:15 -05:00
zhimin.zeng
5454a65c8d FIX: reopen 3mf file the position of assemble model is not right 
Change-Id: I880913c48dde297decac25e5f3c41afacdaf36dc
 2022-12-15 04:38:15 -05:00
chunmao.guo
81e2200efb FIX: [STUDIO-1373] check save failed and show dialog 
Change-Id: Ie8364d5d7156437152df0d87218128b00e08782f
 2022-12-15 04:38:15 -05:00
zhimin.zeng
45de1d8368 FIX: third party 3mf relative position is not correct 
Change-Id: If7df1e3ce7be77e6eccc39d5a18fd014289404a0
(cherry picked from commit 24a03c62fceff160e3fd4e4ce74ff61124ee2a2f)
 2022-12-15 04:38:15 -05:00
lane.wei
c0ccb733dd ENH: some improvements to 3mf loading 
1. convert instance to object when loading previous 3mf
2. fix an exception issue caused by previous commit caused by nil value of import_project_action

Change-Id: Ieed853f0e8d458aab1716acf52307c5d672ebe22
 2022-12-15 04:38:15 -05:00
lane.wei
c3abc64b61 ENH: slicing: add cache data load/export for slicing 
Change-Id: I88b7c79b6f79ec6bed0f829316b67310cac99b44
(cherry picked from commit 67c1d2e8dd459cc4450ce580632f01e25db038ac)
 2022-12-15 04:38:15 -05:00
zhimin.zeng
6ae575d885 FIX: the object move a distance when laying on face 
Change-Id: Iddea713d2237e1cc232a4ce114b17d3fb7c0d8b0
(cherry picked from commit 5e09aceca1794ea2be5e7718a5b3f29f971676a9)
 2022-12-15 04:38:15 -05:00
lane.wei
eecc2a738c ENH: label: refine some label logic 
1. only show label of object in current partplate
2. disable label under gizmo
3. fix a issue of label not updated in time
4. add some logs

Change-Id: If20196a566cc45a4a0c2bcc6bbe212aaa9f74dd3
(cherry picked from commit 3e92ed61e9687d5351a9bb2bc6d25b568cd1c973)
 2022-12-15 04:38:15 -05:00
Stone Li
2cc7dd02af FIX: fix version format in bbs_3mf 
Change-Id: I3a266e42bf7efc44533cdd38a5bd843bae764cbd
Signed-off-by: Stone Li <stone.li@bambulab.com>
 2022-12-15 04:38:15 -05:00
Stone Li
cb83284b24 ENH: store 3mf metadata info to a map 
Change-Id: I17700b1c4a7e47b017d18815e76b4b9bed5c9de4
Signed-off-by: Stone Li <stone.li@bambulab.com>
 2022-12-15 04:38:15 -05:00
lane.wei
08494b5f6f ENH: 3mf_importer: optimize the load speed of 3mf 
1. parallel load object files
2. only load object used by some plate(cli)
3. improve the loading speed when generate objects by using reference

Change-Id: I2719651e715f2e35326e760c4b7cdb3114f54992
 2022-12-15 04:33:48 -05:00
lane.wei
c431cbf202 ENH: CLI: some refines of slicing 
1. add support_used flag in sliced_info
2. use the old thumbnail if no need

Change-Id: I8ad166978fe6f76f86b1ef014945dd70b26a6285
 2022-12-15 04:33:48 -05:00
Stone Li
c7d8b3871a NEW: save unrecognized matadata field in 3dmodel.model 
Change-Id: Ia5db9990b8b871f03ffd961cbf1808d228060e21
Signed-off-by: Stone Li <stone.li@bambulab.com>
 2022-12-15 04:33:48 -05:00
lane.wei
65f2a063b6 ENH: refine multiple plate and CLI logic 
1. support bed_type for each plate in CLI
2. don't render the calibration thumbnail under CLI
3. fix the plate box not generated issue
4. refine the slice_all button's status logic: from all slicable to one slicable
5. fix serveral issues in multiple plate's switch and slicing

Change-Id: I6193a799da0367068169ce315d1fcc9098357fd1
 2022-12-15 04:33:48 -05:00
salt.wei
13ca93adc8 ENH: some change to support layer height edit 
1 delete adaptive layer height config
2 support load and save layer heights profile with 3MF

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I109b3b791c3130b5ab2df445e8ae5cb55a78cec1
 2022-12-15 04:33:48 -05:00
Stone Li
cd1210b0ca ENH: save error code to slice info 
Change-Id: Ic70ef81775c23d160f40ff29f02cc9e1f9d336d6
Signed-off-by: Stone Li <stone.li@bambulab.com>
 2022-12-15 04:33:48 -05:00
zhimin.zeng
eb80720e75 NEW: import svg files 
Change-Id: I1658308f9d9529c969f7067d053f16f779f8b6a6
(cherry picked from commit bfcb05e24ef5224cabc42772e94cc0cbed3de412)
 2022-12-15 04:33:48 -05:00
yifan.wu
e363966f9b ENH: support to set bed type for each plate 
Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: I654743ce8b49057587545c3acfe0b78504242d46
 2022-12-15 04:33:48 -05:00