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
lane.wei
b2d82e7bbb
ENH: thumbnail: regenerate thumbnail for old 3mfs in cli
...
Change-Id: Ia420b4c6aee072eb2a542dff574260c40de47f7d
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
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
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
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
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
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
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
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
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
lane.wei
23db223364
ENH: CLI: adjust the thumbnail size to 512
...
Change-Id: I79c8d584b23e7d4d9c27ce1859b322d9fddebc90
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
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
SoftFever
5b0ba1207e
Change Application name to OrcaSlicer
2023-03-12 10:05:22 +08:00
SoftFever
3a80173533
rename bambu-studio to orca-slicer
2023-03-10 18:53:25 +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
771ef9fd80
support datadir
parameter
...
#325
2023-03-04 15:05:38 +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
lane.wei
5806263731
FIX: cli: fix a crash caused by log
...
Change-Id: I3dad5a47241ff57818e68fda58d7f70f497bf5e1
2023-02-24 17:44:15 +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
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
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
SoftFever
2492e5d39c
merge upstream changes
...
Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>
2023-01-21 00:37:10 +08:00
Patrice Côté
540aa13e25
Add Post-processing ( #159 )
...
It is now possible to call external post-process scripts
2023-01-12 19:42:31 +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
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
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
lane.wei
8375c73ac9
ENH: CLI: some refines on compatible logic
...
1. export compatible related values to 3mf
2. process compatible related values when loading
Change-Id: Ib7ed3d165cda5d62e0074652d474567494141631
(cherry picked from commit 989fe6439d573457fa78afc5376d04d3120dbbfd)
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
lane.wei
776137aaaf
ENH: CLI: support filament mapping
...
support null filament when mapping
Change-Id: I9384fc5a8e78aa8467eef1610d49b92d87512720
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
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
lane.wei
8340e1ceec
ENH: CLI: add warning message
...
send the warning message back to caller
Change-Id: Id36edc9537721fb890f2bd4eb8db4fc0670eb97d
2022-12-15 04:33:48 -05:00
lane.wei
4b655f06d4
FIX: fix the total progress not correct issue
...
Change-Id: I18b9d5034726b45c7331f1dae5e2b24c5e5bd170
(cherry picked from commit ba8c691a2c94f7a2f2ff0ce7f195de20a6c22573)
2022-12-15 04:33:48 -05:00
lane.wei
f9793be848
FIX: fix the auxiliaries files not included issue in cli
...
Change-Id: Iecc18d6013ddc3397b4405a80b24e0630b293fc7
2022-12-15 04:33:48 -05:00
lane.wei
5791ca7e8d
ENH: CLI: add total progress of slicing
...
Change-Id: I05e471aa4cd76642cdd63275620a4b656c8e3327
2022-12-15 04:33:48 -05:00
lane.wei
b44f3ae3e6
ENH: CLI: use json insteadof string for progress pipe
...
Change-Id: I1fdecfa6198d06d0c9745f3cbeb02dece9d8e20f
2022-12-15 04:33:48 -05:00
lane.wei
55f55e3ad9
ENH: CLI: refine logic
...
1. return error when there is object partly inside the plate;
2. add the status callback for progress indicating
3. add the version in help
4. fix the return state of validation from 1 to -51
Change-Id: I716057bd5b28a4beb2871614b94708a0860af1a2
2022-12-15 04:33:48 -05:00
lane.wei
6edafa8502
ENH: CLI: add error code logic in cli
...
Change-Id: I4c1aace95218ff3a7a3a37f47b7d0880c9b64451
2022-12-15 04:33:48 -05:00
lane.wei
2406cc35b6
FIX: cli: fix the thumbnail rendering issue
...
1. fix the color not correct issue
2. fix the warning when loading thumbnail under cli
3. remove the invalid error log
Change-Id: I4dd553b218e264bb811606053d920b5861ad6bd4
2022-12-15 04:33:48 -05:00
lane.wei
451352183c
FIX: export 3mf using SplitModel under CLI
...
Change-Id: Ie6b81de47ebd04b462522d72d30e030e91bda313
(cherry picked from commit 2c284ab5681fd50699a1fd152dd6e4f18a0d4cb4)
2022-12-15 04:33:48 -05:00
lane.wei
d641f947d6
ENH: some small refines
...
1. don't sync_tooltip for it is not used
2. enable the dll black list
3. add some log
Change-Id: I4f7ea008121cf7252ef32680b68f063d146661e5
2022-12-15 04:33:48 -05:00
Tao Wang
6633ef4acf
FIX:fixed the blocking module of linux
...
Change-Id: I06b357f9592631a729208514a3239f944a98cc96
2022-09-29 11:16:43 +08:00
lane.wei
d9d88b8022
change the main thread name to bambustu_main
...
the max length of linux's thread name could only be 16 bytes
bambustudio_main can not be set by pthread_setname_np
Change-Id: Idab83896c81787b32f6a4dde869b101da1d69e5c
2022-09-14 17:39:11 +08:00
chunmao.guo
66c89c62e2
FIX: wxWidgets asserts
...
Change-Id: I583edbde501c2bfe8adfa8fdb525479a379a4cb8
2022-08-26 09:25:59 +08:00