Commit Graph

544 Commits

Author SHA1 Message Date
a8d3e161b4 Change Application name to OrcaSlicer 2023-03-12 10:05:22 +08:00
24087d0683 Merge remote-tracking branch 'upstream/v1.5.0' into SoftFever 2023-03-10 18:46:46 +08:00
5599dac99f 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
38d5ccb29f 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
705ae42040 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
669662bb07 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
1d21b40e63 ENH: custom gcode info should be owned by every plate
Change-Id: I5e5b000b7d04354d3c3cc311d089cb591a37501e
2023-02-22 20:09:17 +08:00
0625da7cb2 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
3d2ecc58c1 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
660b375964 FIX: spiral vase mode layer number
Change-Id: Iac96f790e4030d2eac5666517d37919926cd85c3
2023-02-22 20:09:17 +08:00
758d05aa3e fix a bug that new overhang slowdown algo didn't work properly for cloned objects 2023-02-21 01:28:42 +08:00
6520f3f3ea 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
617410b55a more calibrations
precise wall
etc

Signed-off-by: SoftFever <softfeverever@gmail.com>
2023-02-11 09:55:58 +08:00
5d33db9e5b 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
4663213474 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
cb9cb6bf0a 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
e2a3afa1d9 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
57fef9b168 Port seam fix for Arachne from PrusaSlicer
Signed-off-by: SoftFever <softfeverever@gmail.com>
2023-01-26 01:43:23 +08:00
4cdf23e25f 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
881594facd 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
acf504e3c6 fix: revert "ENH: aligned the z-seam"
This reverts commit 2d0805d4aabbc4e8f25aa93c8f01870c256a0b17.
2023-01-10 19:08:26 +08:00
fb197597c6 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
8078a19a3d 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
9a81a5b882 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
31e87c6497 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
20b3358772 refactor and improve layer time display 2023-01-10 19:08:26 +08:00
caebafecf4 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
34b6881e7b ENH: merge tree support layers to support layers
Will greately reduce repeated codes.

Change-Id: I506a97a907b5b393fe41e13ae53e2f7c9247c4c5
2023-01-10 19:08:26 +08:00
f296194fa2 ENH: put the seam on invisible line of modifier
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: Ib16de93b26e96902ce2e0d844b78d0cc680638a4
2023-01-10 19:08:26 +08:00
b921b3b171 Don't emit M106 P2 command if additional fan is not enabled.
#105
2023-01-05 19:44:32 +08:00
122c68321b Merge branch 'master-remote' into SoftFever
# 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/nl/BambuStudio_nl.po
#	bbl/i18n/sv/BambuStudio_sv.po
#	bbl/i18n/zh_cn/BambuStudio_zh_CN.po
#	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/nl/BambuStudio.mo
#	resources/i18n/sv/BambuStudio.mo
#	resources/i18n/zh_cn/BambuStudio.mo
#	resources/profiles/BBL.json
#	resources/profiles/Creality.json
#	resources/profiles/Voron.json
#	src/libslic3r/PrintConfig.cpp
#	src/libslic3r/TreeSupport.cpp
#	src/slic3r/GUI/DeviceManager.cpp
#	src/slic3r/GUI/ReleaseNote.cpp
#	version.inc
2022-12-31 15:15:58 +08:00
17fea9ede0 GCodeProcessor: Add missing mutex include 2022-12-25 14:29:45 +08:00
0df2a8b5e3 Revert "Merge branch 'SoftFever' into feature/calib"
This reverts commit f5b28201fe, reversing
changes made to d9e9fb2206.

# Conflicts:
#	version.inc
2022-12-25 12:39:45 +08:00
15a62aa730 Merge branch 'master' into SoftFever
Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>

# Conflicts:
#	resources/i18n/zh_cn/BambuStudio.mo
#	src/libslic3r/TreeSupport.cpp
#	version.inc
2022-12-21 16:54:14 +08:00
f35d60fa25 refactor and improve layer time display 2022-12-20 22:24:42 +08:00
a5200e6bcd Add Layer Time/Layer time(Log).
Main logic is ported from SuperSlicer

Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>
2022-12-19 23:58:24 +08:00
60a7c297bc GCodeProcessor: Add missing mutex include 2022-12-16 22:51:07 -05:00
1ec149b4e1 Merge branch 'master' into SoftFever
# Conflicts:
#	bbl/i18n/zh_cn/BambuStudio_zh_CN.po
#	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/nl/BambuStudio.mo
#	resources/i18n/sv/BambuStudio.mo
#	resources/i18n/zh_cn/BambuStudio.mo
#	resources/profiles/Creality.json
#	resources/profiles/Voron.json
#	resources/web/guide/3/index.html
#	src/libslic3r/AppConfig.cpp
#	src/libslic3r/GCode.cpp
#	src/libslic3r/GCode/GCodeProcessor.cpp
#	src/libslic3r/LayerRegion.cpp
#	src/libslic3r/Preset.cpp
#	src/libslic3r/Print.cpp
#	src/libslic3r/PrintConfig.cpp
#	src/libslic3r/PrintConfig.hpp
#	src/libslic3r/PrintObject.cpp
#	src/slic3r/GUI/AboutDialog.cpp
#	src/slic3r/GUI/BBLTopbar.cpp
#	src/slic3r/GUI/ConfigManipulation.cpp
#	src/slic3r/GUI/ConfigWizard.cpp
#	src/slic3r/GUI/GCodeViewer.cpp
#	src/slic3r/GUI/GUI_App.cpp
#	src/slic3r/GUI/GUI_Factories.cpp
#	src/slic3r/GUI/MainFrame.cpp
#	src/slic3r/GUI/Plater.cpp
#	src/slic3r/GUI/Tab.cpp
#	version.inc
2022-12-16 13:59:30 +08:00
dbf51204f3 ENH: sync the different codes
especially for the translation files

Change-Id: I940578ff6e22b0939d42eeed2209bfeddb0eb191
2022-12-15 04:38:15 -05:00
d7e46ef638 FIX: fix the disappear of seam on multi plate
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I58f1f0fa12497dc55c3b2a83abcee883dbbb7d9d
2022-12-15 04:38:15 -05:00
b7c2d8e6be FIX: fix serveral issues in multi-plate slicing
1. fix the thumbnail white issue in some random case
2. fix the thumbnail not update issue under preview panel
3. fix the previous panel's toolpath not clear issue while switch panel
   under preview
4. fix the toolpath not clear issue while switch from 3d to preview in
   some corner case

Change-Id: I158eba35e3b5d8a1e77f19ee9f86801e6a6dbd86
2022-12-15 04:38:15 -05:00
9471122ead ENH: fix gcode viewer line error issue
Should not insert new line in post process
which changes the the final line id in gcode
file

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: Ib8b837cf313a1308260db88bf5390fefe9708cc8
2022-12-15 04:38:15 -05:00
81aa19d770 ENH:remove start G-code layer in preview-slider
Change-Id: I89d66453078bb2df1f9a0161f6cfde032a9dd90d
2022-12-15 04:38:15 -05:00
ecd2ad150d ENH: fix error acceleration in Gcode processor
When travel in x-y-z move, the acceleration should
be limited by trivector rather than one axis.

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: If8e5d394cf5d8772d324b9c851c047d9235d9b6b
2022-12-15 04:38:15 -05:00
15bb5115cf ENH: fix the error time in gcode viewer
As title

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I9322b119b68055baea0e6f63d179a0addf02307e
2022-12-15 04:33:48 -05:00
55f2e6956d FIX: add notes
Change-Id: I230637e6c8b3cfe9e49655cf67f338f77a57732e
2022-12-15 04:33:48 -05:00
3335692d77 ENH: enable thick bridge for wipe tower
Change-Id: I96dae7753995af1862fe4ad33a00fa56cfbb7d3c
(cherry picked from commit 5f98ff50613e3358de10fa1b6d4429ce71e526c2)
2022-12-15 04:33:48 -05:00
7e9f27e5d3 FIX: small wipe tower width result in infinite loop
Change-Id: I1e25dba1728b9427a0cab2c2629c340bf2a4566a
(cherry picked from commit b1fc2f5857e05a177c00134178ddd39882c2a6ab)
2022-12-15 04:33:48 -05:00
93747129ec FIX: several small fixs
Change-Id: Iee10daeedae924fa829148841556e31eb5e9d225
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-12-15 04:33:48 -05:00
244b927bf7 FIX: prime tower start position is incorrect
when support material is used in first tool change

Change-Id: If06459b8404fd599b42187859f476efded57deba
(cherry picked from commit 71f9ed69a3eff4cf3139d04a76176f798a1e1e0d)
2022-12-15 04:33:48 -05:00