3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-27 00:24:00 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
22726 commits 6 branches 69 tags 1.3 GiB
Commit graph

104 commits

Author SHA1 Message Date
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
304e29529b ENH:optimize ams ui layout and add vams load/unload display 
Change-Id: I17db70fe01f3fd00b60804e9a076248eb14fa845
 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
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
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
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
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
e144fce341 ENH:select vams when none ams mode 
Change-Id: Id47e2e89d7b6661cb2f6b147f82bd699237396c9
 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
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
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
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
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
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
tao wang
e962bcfec9 ENH:add ams humidity tips and update new icon 
Change-Id: I8f504fa911ef7a84ca8929af3c5d7c53d289761e
 2023-02-01 16:24:44 +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
SoftFever
1bdedb1c47
Feature/fix more colors (#193) 
* fix more colors

* fix more color on Mac

Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>

* fix new windows issue on Mac

Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>
#137

* Support more PrusaSlicer variables

Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>

* enhance compatibility: bed_shape and wipe_start_x

* fix more color

* build deps

* only build for PR

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

Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>
Signed-off-by: SoftFever <softfeverever@gmail.com>
 2023-01-18 23:06:39 +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
tao wang
030efb339a ENH: hide some functions which are not ready on U2 version 
Change-Id: I6ff7f98d55d9734938b65aaa72727320dd3c5f6e
 2022-12-26 05:31:54 -05:00
tao wang
0d4b8382f5 FIX:change tray id from 1,2,3,4 to A1,A2,A3,A4 
Change-Id: I9da42abb50d95c7a9c41064a993c3cebb68394d9
 2022-12-15 04:38:15 -05:00
tao wang
52e431170c FIX:change the humidity level icons 
Change-Id: I09f0ffce9ee32ec8b7c5948971bb389f5462b89a
 2022-12-15 04:38:15 -05:00
tao.jin
1428a6bec7 ENH:add chinese translation 
Change-Id: Id2d238e3e2918229c88dd986ed41848ea932abcf
 2022-12-15 04:38:15 -05:00
tao wang
0db1b52b23 FIX:fixed some issue with send print and ams ui 
Change-Id: I1a37bad6ec1f193f9fd98c74506b3bb0358ece6d
 2022-12-15 04:38:15 -05:00
Arthur
4419703f41 ENH: do not add L prefix to empty string 
Change-Id: I0fc7f57baf256452645be497020d75ffaf9c20f4
 2022-12-15 04:38:15 -05:00
tao wang
eca5897a25 FIX:fixed appconfig is not saved when switching dark mode 
Change-Id: I77fc3808309a23497000c34b6047a359d12c4622
 2022-12-15 04:38:15 -05:00
tao wang
a9f3f195e1 FIX:fixed ams setting button display error due to scaling 
Change-Id: I810b9f75410d15b16851ec31e710d037d2fba1d6
 2022-12-15 04:38:15 -05:00
tao wang
8216265725 NEW:add remaining capacity detection switch in ams setting 
Change-Id: I8f7be78dbf881bb5e2564aea4d0e01d78f1b0433
 2022-12-15 04:38:15 -05:00
tao wang
6f4e80bbb6 NEW:added dark mode 
Change-Id: I3f61f1d93020e0a9dfba2c7d6cf6bf5194effcfa
 2022-12-15 04:38:15 -05:00
tao wang
de0b0508eb FIX:fixed the display error caused by the incorrect remain 
Change-Id: I9c0bb7325d4d9ae043aa3dc868f94102e3aa24ae
 2022-12-15 04:38:15 -05:00
tao wang
3925ceb9f4 ENH:add humidity display/surplus material 
Change-Id: I1a04df257c9b09fef7ff06cfa192644478a30716
 2022-12-15 04:38:15 -05:00
liz.li
066a4d70c9 NEW:add ams guide wiki 
Change-Id: I825f9dbbf3aa0a32eb5272b941179025ef2d35e2
 2022-10-20 19:34:37 +08:00
Stone Li
0ed5b956ae NEW: add ams option when sending a printing job 
Change-Id: If75b9da926c1d9a9e59f3e16b3d491a6e0bdb2e6
Signed-off-by: Stone Li <stone.li@bambulab.com>
 2022-09-02 13:16:54 +08:00
tao wang
4f4223a2b4 FIX:fixed Multiple AMS display error 
Change-Id: I94f67080b086d60cf16aa50fdb46a58da9e8e12f
 2022-09-02 12:52:18 +08:00
tao wang
0ea824d167 FIX:fixed the ams item cannot be adjusted layout 
Change-Id: I8e187bb6f50883d7a607c045cf643eab4ba71ea2
 2022-09-02 12:52:18 +08:00
tao wang
459fe36235 FIX:fixed amsdata not sync after changed ams 
Change-Id: If1c087c42258897fec7df5d44ff039bb0eec3b25
 2022-09-02 12:52:18 +08:00
liz.li
618aebfb79 FIX:adjust rounding of some buttons 
Change-Id: I8d1ed2b3d352689ea99fe00f26e405cc63151073
 2022-08-26 09:25:59 +08:00
tao wang
19cb1dbe4d FIX:fixed amsitem is too close to Amslib 
Change-Id: I25a8b232a169cd0dcb0290490795192fa0b29aba
 2022-08-08 22:19:42 +08:00
liz.li
cddce117c9 ENH::never change AMSLib disabled color 
Change-Id: I54878d202a39b754f3e78a31f83f8170b2722bc9
 2022-08-05 16:11:42 +08:00
liz.li
aac23eb6b4 ENH:adjust AMSMaterial clickable region 
Change-Id: If81e156fde4f9c724844a7bce6fd97db1d98b4e3
 2022-08-05 16:11:42 +08:00
Stone Li
ea7aaf7a8d FIX: seprate filament_type and display_filament_type 
special case for "Support G" and "Support W"

Change-Id: I26f873083d6afb58fb10ebc9beef54fbf5e18320
Signed-off-by: Stone Li <stone.li@bambulab.com>
 2022-08-05 16:11:42 +08:00
tao wang
74e92ac51d FIX:amsmapping update layout and fixes some issues 
Change-Id: I3d88a06d5a9ac084b7ec498f7d201dda38d00fe7
 2022-08-05 16:11:42 +08:00
liz.li
55d59c7248 ENH:ams dialog 
Change-Id: Ia7f7849c13bc630114a0d703c0b5386e2e88349c
 2022-08-05 16:11:42 +08:00
tao wang
56e05a0721 FIX:fixed Amslib does not refresh the current layout 
Change-Id: If5a050b314aea554a8b76b22a80f9c3b50466ad4
 2022-08-05 16:11:42 +08:00
tao wang
da732ac396 FIX:optimize RDIF animation 
Change-Id: I45e45b92efa43f290151e39715ca057da4d862c1
 2022-08-05 16:11:42 +08:00