166 commits

Author	SHA1	Message	Date
maosheng.wei	eb3a97f55b	ENH: [STUDIO-2450] Update the bed type to be consistent with the gcode ... Change-Id: Ic69face644bc193e7125535697905c35ba210058	2023-07-07 17:25:51 +08:00
manch1n	352f4222b1	ENH: increase conflict threshold to 1mm for both support lines ... Little overlap of support lines from two objects are allowed. Change-Id: I738874ee71fc9787abbef764dbad762c76bc5731 (cherry picked from commit a5f7a53dc818d598523149d675fd0310f5d22f86)	2023-07-07 17:25:51 +08:00
manch1n	dcb1f68b89	FIX: check conflict when only have mutilcolor obj and wipetower ... STUDIO-2789 Change-Id: Ic2cdd76416fc979b13f9c2fc9a29a5312b832caa (cherry picked from commit 47319cafa726983f66577209b2c58fd7ead304ee)	2023-07-07 17:25:51 +08:00
SoftFever	c3c6bbc4e5	Port PrusaSlicer staggered_inner_seams	2023-07-06 21:08:39 +08:00
SoftFever	da90e22b9f	Support interface fan speed	2023-05-07 23:52:11 +08:00
SoftFever	4807b9d1b6	Fix an issue that OrcaSlicer can't open previously generated gcode/.3mf file #712 #958	2023-05-06 20:13:58 +08:00
Scott Mudge	2e223551e4	Fan Speed Delay + Fan Kickstart Feature (#910) ... Initial commit for fan speed delay, required some changes when porting from SuperSlicer. Co-authored-by: SoftFever <softfeverever@gmail.com>	2023-05-06 13:41: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
manch1n	87eb0f3665	ENH: show the layer and height of conflict position ... Change-Id: If80e81b5556f5afc3228a00edc2593bd8cfe63e4 (cherry picked from commit 895e0f2ecf8e259cfdb7c27081b767bfbaa3ffb6)	2023-04-17 15:39:02 +08:00
manch1n	b5b7264e99	ENH: add wipe tower into conflict check ... Change-Id: I9684ec17ccbfdea39deae6e5089b74ce3124d57b (cherry picked from commit f6ee82b4ecf8bf9de91d0043b514cdabb7284b7e)	2023-04-17 15:39:02 +08:00
liz.li	62af2b9608	FIX: vector capacity reset(STUDIO-2239) ... Change-Id: Ie40e8c6d3a42b6a40f4f73d6906acdc6e26d0b41	2023-04-17 15:39:02 +08:00
zhimin.zeng	ad80943c69	FIX: delete unnecessary travel of wipe tower ... STUDIO-2203 Change-Id: Ic55030a09f66a789245f80096e8f3ffea73a904f	2023-04-17 15:39:02 +08:00
manch1n	d72b4c1bfe	FIX: Disable print button when gcode has conflict ... Also fix a crash bug due to setStarted and setDone. Change-Id: Ib9b069fe4b7e5d1fc359f48e44b4032dd8249428 (cherry picked from commit 9ef190ed3ecd66d12617ad96e927ff34251395a2)	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
salt.wei	0b126dbed6	ENH: fix the floating layer issue ... Fix for floating layer under multi-color printing while z_hop is zero. Signed-off-by: salt.wei <salt.wei@bambulab.com> Change-Id: I8cc96bd18020cac8424fe4c3e62fb87da118b826	2023-04-17 15:39:02 +08:00
zhimin.zeng	dda90b1810	ENH: get start_gcode filament ... Change-Id: Ia511f758d5c59ddc38c79f251e8c95511de4a235	2023-04-17 15:39:02 +08:00
zhimin.zeng	81daebb5a5	FIX: the first layer is not printed in the correct order ... Change-Id: Ia8ad49417e6b59fa10b763cb0e207f5f79b9a4d2	2023-04-17 15:39:02 +08:00
salt.wei	61b271f379	ENH: fix for STUDIO-881 ... Thanks prusa Signed-off-by: salt.wei <salt.wei@bambulab.com> Change-Id: I2e1c1088d29dd5401016ca41d3ed6dec87e0acd1	2023-04-17 15:39:02 +08:00
salt.wei	31f8034422	ENH: force to use . as decimal point ... "std::cout << float number" is unsafe which may use , as decimal point when switch language. Signed-off-by: salt.wei <salt.wei@bambulab.com> Change-Id: I8a379117168eab0111dc93987b1d6130a741ade6	2023-04-17 15:39:02 +08:00
salt.wei	1278cbf461	ENH: remove tbb simplify in gcode export ... Useless after importing AABB tree. Signed-off-by: salt.wei <salt.wei@bambulab.com> Change-Id: Iaec9bef4a2a6bc4d097c6fd75720cb69d9cf314f	2023-04-17 15:39:02 +08:00
salt.wei	4c4b274408	ENH: speed gcode export up again ... thanks prusa Signed-off-by: salt.wei <salt.wei@bambulab.com> Change-Id: Ifbe5e2ea55b16a7fe281b54ca16c37695c15f5b1	2023-04-17 15:39:02 +08:00
SoftFever	2b38153395	fix invalid characters in gcode	2023-03-12 23:38:46 +08:00
SoftFever	5b0ba1207e	Change Application name to OrcaSlicer	2023-03-12 10:05:22 +08:00
SoftFever	da61839e84	Merge remote-tracking branch 'upstream/v1.5.0' into SoftFever	2023-03-10 18:46:46 +08:00
salt.wei	ac4b35def8	ENH: force to use . as decimal point ... "std::cout << float number" is unsafe which may use , as decimal point when switch language. Signed-off-by: salt.wei <salt.wei@bambulab.com> Change-Id: I8a379117168eab0111dc93987b1d6130a741ade6	2023-03-09 19:07:29 +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
qing.zhang	6a391de290	FIX: speed 0 on macOS 13.2 STUDIO-2265 ... Signed-off-by: qing.zhang <qing.zhang@bambulab.com> Change-Id: Ia8d92f6a0f7d84c1216d9403793e5fa7671ee8de	2023-02-24 17:44:15 +08:00
qing.zhang	350adb6176	FIX: revert "FIX: fix adjust of cooling time" ... This reverts commit 9e026a289542545d5f63cd72fb9416be1521ecc2. This Revert "ENH: STUDIO-2221 adjust cooling time for each layer" This reverts commit eb1fa5975eb7dc3ff832539e9bec5a04515ff2f9. Change-Id: Iba8d0a1492b81922aad0d64df81c74cff5eabbb3	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
qing.zhang	0b0a1a3d48	FIX: fix adjust of cooling time ... Signed-off-by: qing.zhang <qing.zhang@bambulab.com> Change-Id: I5eae0ed7e53fddb18c99f510373ba5a687fd2c8e	2023-02-22 20:09:17 +08:00
qing.zhang	4b86b978d1	ENH: STUDIO-2221 adjust cooling time for each layer ... sub filament change time from layer time to adjust layer speed Signed-off-by: qing.zhang <qing.zhang@bambulab.com> Change-Id: I2f1c41a36946765b74ecad58ce102abe98e00dac	2023-02-22 20:09:17 +08:00
liz.li	b3c4447191	FIX: spiral vase mode layer number ... Change-Id: Iac96f790e4030d2eac5666517d37919926cd85c3	2023-02-22 20:09:17 +08:00
SoftFever	c8687989e5	fix a bug that new overhang slowdown algo didn't work properly for cloned objects	2023-02-21 01:28:42 +08:00
SoftFever	e9613e971d	1.4.5 features (#319) ... * Changes: Improve precise wall Port PS2.6 overhang slowdown feature Implement overhang fan for new overhang slowdown algo Add option to switch between classic/new overhang slowdown implementation Set Arachne as default engine Small adjustment of temp calibration range turn off small perimeter by default Small UI tweaks Change default top_surface_pattern to monotonic Fine tune jerk Signed-off-by: SoftFever <softfeverever@gmail.com> * Disable optimizations for RelWithDebInfo Signed-off-by: SoftFever <softfeverever@gmail.com> * fix an issue that max volumetirc/vfa calibration can't send to print Signed-off-by: SoftFever <softfeverever@gmail.com> #322 * fix build errors Signed-off-by: SoftFever <softfeverever@gmail.com> --------- Signed-off-by: SoftFever <softfeverever@gmail.com>	2023-02-17 23:09:18 +08:00
SoftFever	7fe5b84c41	more calibrations ... precise wall etc Signed-off-by: SoftFever <softfeverever@gmail.com>	2023-02-11 09:55:58 +08:00
zhimin.zeng	217234c8d3	FIX: Support Filament is being "Flush into objects' infill" ... When using "Flush into objects' infill" with support filament, it also get's flushed into the object's infill which shouldn't be happening. Change-Id: I0f1cb3d5ee3cf5489ccab957989c6c24336f8845 (cherry picked from commit f83e63feb3ad5a14b0f4304e2e6fb1c5828270ec)	2023-02-02 12:14:41 +08:00
salt.wei	431eabd464	ENH: use gcode processer to get precise layer number ... Using layer z to calculate total layer number is not precision, because for some models with sharp top layer, the top layer may be empty. Check the final layer change in final gcode file. This must be same with total layer number. Jira: Studio-2123 Signed-off-by: salt.wei <salt.wei@bambulab.com> Change-Id: I5d001a8bb9548c3fb5f67fda966051ac3bb16502	2023-02-01 16:24:44 +08:00
salt.wei	170a24a43f	ENH: show travel time in gcode viewer ... Seperate travel time from extrusion role time and show it seperately. Signed-off-by: salt.wei <salt.wei@bambulab.com> Change-Id: Icf0aaf63c4d4ed7d1407037e5ae051d61938f973	2023-02-01 16:24:44 +08:00
四季奶青七分甜	b7b9029548	fix: Revert "ENH: avoid overhang area when set the seam position" ... This reverts commit 1e95803df3733021e80241ecf7b88976708f0cf7. Reason for revert: some model test not good, need to update curve function Change-Id: I6afd6115d21198f60453d4f507905b6684a65cff	2023-02-01 16:24:44 +08:00
SoftFever	031a027717	Port seam fix for Arachne from PrusaSlicer ... Signed-off-by: SoftFever <softfeverever@gmail.com>	2023-01-26 01:43:23 +08:00
Patrice Côté	2a757b1b95	Compatibility with klipper_estimator (#229) ... Changed estimated time string in order to be fully compatible with klipper_estimator. Format is now the same as Slic3r, PrusaSlicer and SuperSlicer	2023-01-25 21:58:59 +08:00
Patrice Côté	5692e02c54	Enable absolute/relative extrusion option on non BBL printers (#205) ... Add the option to use non-relative extrusion in printer config screen. Some extruders do not play well with relative extrusion... Remove reference to multi-extruder Remove reference to multi-extruder change g-code comment for M83 relative extrusion changed comment for M83 Remove commented line of code In this specific case, we delete the old line of code because it refers to a variable that was deleted from the rest of the code (RELATIVE_E_AXIS)	2023-01-24 13:02:52 +08:00
salt.wei	ba064d44a1	fix: revert "ENH: aligned the z-seam" ... This reverts commit 2d0805d4aabbc4e8f25aa93c8f01870c256a0b17.	2023-01-10 19:08:26 +08:00
salt.wei	b13928b615	fix: revert "FIX: fix the out range of array of seam algining" ... This reverts commit f100c10fa8aa0460d3ff11723c6a2504b6b69bba. Change-Id: Ice36f6f41d5a50a7244d8f09960876d9539802d8	2023-01-10 19:08:26 +08:00
qing.zhang	d42d6bec87	FIX: fix the out range of array of seam algining ... Signed-off-by: qing.zhang <qing.zhang@bambulab.com> Change-Id: I655e7a0a5cdac6c05ddd8a6c7f38e1f97a7d0f96	2023-01-10 19:08:26 +08:00
qing.zhang	ad6257ca84	ENH: aligned the z-seam ... Signed-off-by: qing.zhang <qing.zhang@bambulab.com> Change-Id: I60e1a046fb236d588a5e83b602fabd39580228fb	2023-01-10 19:08:26 +08:00
qing.zhang	3a6f033794	ENH: avoid overhang area when set the seam position ... Signed-off-by: qing.zhang <qing.zhang@bambulab.com> Change-Id: I58eb8c091b68b8c64f44d21db88d2f9155e42e42	2023-01-10 19:08:26 +08:00
SoftFever	357fa2bfe1	refactor and improve layer time display	2023-01-10 19:08:26 +08:00
SoftFever	f42ae3239e	Add Layer Time/Layer time(Log). ... Main logic is ported from SuperSlicer Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>	2023-01-10 19:08:26 +08:00
Arthur	646b259972	ENH: merge tree support layers to support layers ... Will greately reduce repeated codes. Change-Id: I506a97a907b5b393fe41e13ae53e2f7c9247c4c5	2023-01-10 19:08:26 +08:00