131 Commits

Author	SHA1	Message	Date
liz.li	1f54aaf22b	NEW: add calibration ... Change-Id: I03e5489a67042e7f76f5a42260a289d540b5a63a (cherry picked from commit cbac2c639db830eb779b1979c8d6b4eb3decb7e6)	2023-07-07 17:25:51 +08:00
tao wang	fdf589de3e	ENH:no longer hide the retry button ... Change-Id: Ia3c598b167093d972b4c6a2b5927700450431cb3	2023-07-07 17:25:51 +08:00
tao wang	a476bbd229	FIX:optimize the process of loading/unloading p1p printers ... Change-Id: Ib1b83aceca9753a6d6086c0b159da015d705f86a	2023-07-07 17:25:51 +08:00
tao wang	2d43ce4702	NEW:disable ams mapping when sending printing ... Change-Id: Icf2c859151c8c5605e651426154ce6fa84269b87	2023-07-07 17:25:51 +08:00
tao wang	da42ed6f58	ENH:display in black when the transparent filament is loaded ... Change-Id: I4c2887ef93ac81571bcb037ddee8a363ab428e04	2023-07-07 17:25:51 +08:00
tao wang	fb6a40b06b	ENH:optimizing the style of AMS refueling process in a French language ... Change-Id: Ie0acb57aadd577c3dd7f42a5d76781e19a75dbd3	2023-07-07 17:25:51 +08:00
tao wang	73d3b37979	NEW:update the style when the virtual tray is empty ... Change-Id: I40fc05ce31ed9225e5dea6d080fdbff138b2f9d8	2023-07-07 17:25:51 +08:00
tao wang	839f4fe85e	ENH:display the retry button when the print error requires retty ... Change-Id: Ia0aaa33015dec2492d611c93293becbf32f34c23	2023-07-07 17:25:51 +08:00
tao wang	9f8397b187	NEW:support transparent color display ... Change-Id: I49e0e4c507121af7dad912a3a549348e7ade8eec	2023-07-07 17:25:51 +08:00
tao wang	85d7baf79c	FIX:fixed incomplete display of button text in German ... Change-Id: Ic801d5d13c5ddd2e79b648d5eaebd71639023dee	2023-07-07 17:25:51 +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
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
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
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
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
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