3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-20 07:11:12 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6
21886 commits 10 branches 72 tags 3.3 GiB
Commit graph

256 commits

Author SHA1 Message Date
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
tao wang
ef6827a6f8 FIX:fixed gradient filament color display on MacOS 
Change-Id: I57f3243f5013b8d26ace3fae2cc41e807494af6b
 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
tao wang
5e6cfb069a NEW:hide the entrance of filaments backup 
Change-Id: I383de6ced5efb20a19ca8171f981370bf8fcc3aa
 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
tao wang
a798ed22b9 ENH:optimize virtual tray when printer is no AMS 
Change-Id: I68425afc8c3f467a8e3f3c2745b6ac9cfb80232e
 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
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
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
tao wang
1eb96b6979 ENH:synchronize the status of AMS and printers 
Change-Id: Ied38fbee8d78a984df9d7a46d3f69b54fea7fef2
 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
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
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
bda92795bb FIX: [STUDIO-1033] rm webview script handler on webview destory 
Change-Id: I2e9390dfaad46da9e158a43026ef872aaf88d589
 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
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
chunmao.guo
c44a240ec0 FIX: [STUDIO-2511] handle dbl click in ComboBox 
Change-Id: I27075e43de4a78446972806b57771f0880677935
 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
tao wang
c6e49af3fe ENH:add some protection for fan control 
Change-Id: Ic60deaec60b5238f9307b7b4bb928293701c2fd5
 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
tao wang
d9395e6405 ENH:optimize the switching of multiple AMS and vams 
Change-Id: I031e3248164aa2fc243c6ebf7418c535119e7ffc
 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
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
9f3a89320b FIX: [STUDIO-1033] rm webview script handler on webview destory 
Change-Id: If1465ba6bf997bf17b8a33bc33d0f20d34fcbdc7
 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
tao wang
a11cce7b26 ENH:optimize ams humidity display 
Change-Id: Ied40225c6618d6961f5fd8c357bb227b512437ea
 2023-04-17 15:39:02 +08:00
SoftFever
07d048ef36 USE_PRIVATE_FONTS 2023-04-10 20:44:20 +08:00
SoftFever
26daac8958 tweak plate name location for Mac and Linux 2023-04-04 21:36:44 +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
SoftFever
f5c4cc9a54 New feature: plate name 2023-03-29 21:36:14 +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
tao wang
cee236e1aa FIX:fixed that the load/unload text is not translated 
Change-Id: I99a4212568b056a212a0874622e5e2f4f2a581b7
 2023-02-28 18:44:28 +08:00
chunmao.guo
60dbf71cd6 FIX: [STUDIO-2331] gtk resize popup window 
Change-Id: I3ad2c26c5c1fcc94964fa838ce2596b727712195
 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
tao wang
eefe65321f FIX:fixed fan control will close after operation 
Change-Id: Ic512dd7838bc843dc71f4bc75bdf719443b98124
 2023-02-24 17:44:15 +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
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
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
81dea77932 FIX: [STUDIO-2186] hide PopupWindow on alt-tab 
Change-Id: Ie1bffdd9ace2c6e05979743da9f75ca2c1e87cf3
 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
tao.jin
c2eeb2522b FIX: display of Label and warning dialog 
Change-Id: Ib147f28096336b07b033c2e8104a56f5c28b7d93
 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
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
chunmao.guo
21a6281998 FIX: [STUDIO-1997] SpinInput messureSize 
Change-Id: I5923248b4980cb7638ce683d4e32e9c271b102cd
 2023-02-02 12:14:41 +08:00