SoftFever
b8172316b8
Merge branch 'v1.7.2-remote'
...
Signed-off-by: SoftFever <softfeverever@gmail.com >
# Conflicts:
# deps/ZLIB/ZLIB.cmake
# localization/i18n/OrcaSlicer.pot
# localization/i18n/de/OrcaSlicer_de.po
# localization/i18n/en/OrcaSlicer_en.po
# localization/i18n/es/OrcaSlicer_es.po
# localization/i18n/fr/OrcaSlicer_fr.po
# localization/i18n/hu/OrcaSlicer_hu.po
# localization/i18n/it/OrcaSlicer_it.po
# localization/i18n/ja/OrcaSlicer_ja.po
# localization/i18n/ko/OrcaSlicer_ko.po
# localization/i18n/list.txt
# localization/i18n/nl/OrcaSlicer_nl.po
# localization/i18n/sv/OrcaSlicer_sv.po
# localization/i18n/zh_cn/OrcaSlicer_zh_CN.po
# resources/calib/PressureAdvance/pa_pattern.3mf
# resources/handy_models/Disc.stl
# 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/BambuStudio.mo
# resources/i18n/ko/BambuStudio.mo
# resources/i18n/nl/BambuStudio.mo
# resources/i18n/sv/BambuStudio.mo
# resources/i18n/zh_cn/BambuStudio.mo
# resources/profiles/Anycubic.json
# resources/profiles/Anycubic/machine/Anycubic Kobra 2 0.4 nozzle.json
# resources/profiles/BBL.json
# resources/profiles/BBL/filament/Bambu ASA @BBL X1C 0.2 nozzle.json
# resources/profiles/BBL/filament/Bambu ASA @BBL X1C 0.4 nozzle.json
# resources/profiles/BBL/filament/Bambu ASA @BBL X1C.json
# resources/profiles/BBL/filament/Bambu PA-CF @base.json
# resources/profiles/BBL/filament/Bambu PA6-CF @BBL X1C.json
# resources/profiles/BBL/filament/Bambu PA6-CF @base.json
# resources/profiles/BBL/filament/Bambu PETG-CF @BBL X1C.json
# resources/profiles/BBL/filament/Bambu Support W @BBL X1.json
# resources/profiles/BBL/filament/Bambu TPU 95A @BBL X1.json
# resources/profiles/BBL/filament/Generic HIPS @BBL X1C 0.2 nozzle.json
# resources/profiles/BBL/filament/Generic HIPS @BBL X1C.json
# resources/profiles/BBL/filament/Generic PA-CF.json
# resources/profiles/BBL/filament/Generic PC.json
# resources/profiles/BBL/filament/Generic PETG-CF @BBL X1C.json
# resources/profiles/BBL/filament/Generic PLA @0.2 nozzle.json
# resources/profiles/BBL/filament/Generic PLA High Speed @BBL P1P 0.2 nozzle.json
# resources/profiles/BBL/filament/Generic PLA High Speed @BBL P1P.json
# resources/profiles/BBL/filament/Generic PLA High Speed @BBL X1C 0.2 nozzle.json
# resources/profiles/BBL/filament/Generic PLA High Speed @BBL X1C.json
# resources/profiles/BBL/filament/Generic PLA-CF.json
# resources/profiles/BBL/filament/Generic PLA.json
# resources/profiles/BBL/filament/Generic TPU.json
# resources/profiles/BBL/filament/Overture Matte PLA @BBL P1P 0.2 nozzle.json
# resources/profiles/BBL/filament/Overture Matte PLA @BBL P1P.json
# resources/profiles/BBL/filament/Overture Matte PLA @BBL X1.json
# resources/profiles/BBL/filament/Overture Matte PLA @BBL X1C 0.2 nozzle.json
# resources/profiles/BBL/filament/Overture Matte PLA @BBL X1C.json
# resources/profiles/BBL/filament/Overture Matte PLA @base.json
# resources/profiles/BBL/filament/Overture PLA @BBL P1P 0.2 nozzle.json
# resources/profiles/BBL/filament/Overture PLA @BBL P1P.json
# resources/profiles/BBL/filament/Overture PLA @BBL X1.json
# resources/profiles/BBL/filament/Overture PLA @BBL X1C 0.2 nozzle.json
# resources/profiles/BBL/filament/Overture PLA @BBL X1C.json
# resources/profiles/BBL/filament/Overture PLA @base.json
# resources/profiles/BBL/filament/P1P/Bambu TPU 95A @BBL P1P.json
# resources/profiles/BBL/filament/P1P/Generic PLA @BBL P1P 0.2 nozzle.json
# resources/profiles/BBL/filament/P1P/Generic TPU @BBL P1P.json
# resources/profiles/BBL/filament/P1P/eSUN PLA+ @BBL P1P 0.2 nozzle.json
# resources/profiles/BBL/filament/P1P/eSUN PLA+ @BBL P1P.json
# resources/profiles/BBL/filament/PolyLite ABS @BBL P1P 0.2 nozzle.json
# resources/profiles/BBL/filament/PolyLite ABS @BBL P1P.json
# resources/profiles/BBL/filament/PolyLite ABS @BBL X1C 0.2 nozzle.json
# resources/profiles/BBL/filament/PolyLite ABS @BBL X1C.json
# resources/profiles/BBL/filament/PolyLite ABS @base.json
# resources/profiles/BBL/filament/PolyLite ASA @BBL P1P 0.2 nozzle.json
# resources/profiles/BBL/filament/PolyLite ASA @BBL P1P.json
# resources/profiles/BBL/filament/PolyLite ASA @BBL X1C 0.2 nozzle.json
# resources/profiles/BBL/filament/PolyLite ASA @BBL X1C.json
# resources/profiles/BBL/filament/PolyLite ASA @base.json
# resources/profiles/BBL/filament/PolyLite PETG @BBL P1P 0.2 nozzle.json
# resources/profiles/BBL/filament/PolyLite PETG @BBL P1P.json
# resources/profiles/BBL/filament/PolyLite PETG @BBL X1C 0.2 nozzle.json
# resources/profiles/BBL/filament/PolyLite PETG @BBL X1C.json
# resources/profiles/BBL/filament/PolyLite PETG @base.json
# resources/profiles/BBL/filament/PolyLite PLA @BBL X1.json
# resources/profiles/BBL/filament/PolyTerra PLA @BBL X1.json
# resources/profiles/BBL/filament/eSUN PLA+ @BBL X1.json
# resources/profiles/BBL/filament/eSUN PLA+ @BBL X1C 0.2 nozzle.json
# resources/profiles/BBL/filament/eSUN PLA+ @BBL X1C.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 P1S 0.2 nozzle.json
# resources/profiles/BBL/machine/Bambu Lab P1S 0.4 nozzle.json
# resources/profiles/BBL/machine/Bambu Lab P1S 0.6 nozzle.json
# resources/profiles/BBL/machine/Bambu Lab P1S 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/BBL/process/0.06mm Standard @BBL X1C 0.2 nozzle.json
# resources/profiles/BBL/process/0.08mm Extra Fine @BBL P1P.json
# resources/profiles/BBL/process/0.08mm Extra Fine @BBL X1C.json
# resources/profiles/BBL/process/0.08mm Standard @BBL X1C 0.2 nozzle.json
# resources/profiles/BBL/process/0.10mm Standard @BBL P1P 0.2 nozzle.json
# resources/profiles/BBL/process/0.10mm Standard @BBL X1C 0.2 nozzle.json
# resources/profiles/BBL/process/0.12mm Fine @BBL P1P.json
# resources/profiles/BBL/process/0.12mm Fine @BBL X1C.json
# resources/profiles/BBL/process/0.12mm Standard @BBL X1C 0.2 nozzle.json
# resources/profiles/BBL/process/0.14mm Standard @BBL X1C 0.2 nozzle.json
# resources/profiles/BBL/process/0.16mm Optimal @BBL P1P.json
# resources/profiles/BBL/process/0.16mm Optimal @BBL X1C.json
# resources/profiles/BBL/process/0.18mm Standard @BBL X1C 0.6 nozzle.json
# resources/profiles/BBL/process/0.20mm Standard @BBL P1P.json
# resources/profiles/BBL/process/0.20mm Standard @BBL X1C.json
# resources/profiles/BBL/process/0.20mm Strength @BBL P1P.json
# resources/profiles/BBL/process/0.20mm Strength @BBL X1C.json
# resources/profiles/BBL/process/0.24mm Draft @BBL P1P.json
# resources/profiles/BBL/process/0.24mm Draft @BBL X1C.json
# resources/profiles/BBL/process/0.24mm Standard @BBL X1C 0.6 nozzle.json
# resources/profiles/BBL/process/0.24mm Standard @BBL X1C 0.8 nozzle.json
# resources/profiles/BBL/process/0.28mm Extra Draft @BBL P1P.json
# resources/profiles/BBL/process/0.28mm Extra Draft @BBL X1C.json
# resources/profiles/BBL/process/0.30mm Standard @BBL P1P 0.6 nozzle.json
# resources/profiles/BBL/process/0.30mm Standard @BBL X1 0.6 nozzle.json
# resources/profiles/BBL/process/0.30mm Standard @BBL X1C 0.6 nozzle.json
# resources/profiles/BBL/process/0.30mm Strength @BBL X1C 0.6 nozzle.json
# resources/profiles/BBL/process/0.32mm Standard @BBL X1C 0.8 nozzle.json
# resources/profiles/BBL/process/0.36mm Standard @BBL X1C 0.6 nozzle.json
# resources/profiles/BBL/process/0.40mm Standard @BBL P1P 0.8 nozzle.json
# resources/profiles/BBL/process/0.40mm Standard @BBL X1 0.8 nozzle.json
# resources/profiles/BBL/process/0.40mm Standard @BBL X1C 0.8 nozzle.json
# resources/profiles/BBL/process/0.42mm Standard @BBL X1C 0.6 nozzle.json
# resources/profiles/BBL/process/0.48mm Standard @BBL X1C 0.8 nozzle.json
# resources/profiles/BBL/process/0.56mm Standard @BBL X1C 0.8 nozzle.json
# resources/profiles/BBL/process/fdm_process_bbl_common.json
# resources/profiles/Creality.json
# resources/profiles/Creality/machine/Creality CR-10 Max 0.4 nozzle.json
# resources/profiles/Creality/machine/Creality CR-10 V2 0.4 nozzle.json
# resources/profiles/Creality/machine/Creality CR-6 Max 0.2 nozzle.json
# resources/profiles/Creality/machine/Creality CR-6 Max 0.4 nozzle.json
# resources/profiles/Creality/machine/Creality CR-6 Max 0.6 nozzle.json
# resources/profiles/Creality/machine/Creality CR-6 Max 0.8 nozzle.json
# resources/profiles/Creality/machine/Creality CR-6 SE 0.2 nozzle.json
# resources/profiles/Creality/machine/Creality CR-6 SE 0.4 nozzle.json
# resources/profiles/Creality/machine/Creality CR-6 SE 0.6 nozzle.json
# resources/profiles/Creality/machine/Creality CR-6 SE 0.8 nozzle.json
# resources/profiles/Creality/machine/Creality Ender-3 S1 0.4 nozzle.json
# resources/profiles/Creality/machine/Creality Ender-3 S1 Pro 0.4 nozzle.json
# resources/profiles/Creality/machine/Creality Ender-5 0.4 nozzle.json
# resources/profiles/Creality/machine/Creality Ender-5 Plus 0.4 nozzle.json
# resources/profiles/Creality/machine/Creality Ender-5 S1 0.4 nozzle.json
# resources/profiles/Creality/machine/Creality Ender-5S 0.4 nozzle.json
# resources/profiles/Creality/machine/Creality Ender-6 0.4 nozzle.json
# resources/profiles/Elegoo.json
# resources/profiles/Elegoo/machine/Elegoo Neptune 0.4 nozzle.json
# resources/profiles/Elegoo/machine/Elegoo Neptune 2 0.4 nozzle.json
# resources/profiles/Elegoo/machine/Elegoo Neptune 2D 0.4 nozzle.json
# resources/profiles/Elegoo/machine/Elegoo Neptune 2S 0.4 nozzle.json
# resources/profiles/Elegoo/machine/Elegoo Neptune 3 0.4 nozzle.json
# resources/profiles/Elegoo/machine/Elegoo Neptune 3 Max 0.4 nozzle.json
# resources/profiles/Elegoo/machine/Elegoo Neptune 3 Plus 0.4 nozzle.json
# resources/profiles/Elegoo/machine/Elegoo Neptune 3 Pro 0.4 nozzle.json
# resources/profiles/Elegoo/machine/Elegoo Neptune X 0.4 nozzle.json
# resources/profiles/Prusa.json
# resources/profiles/Prusa/machine/Prusa MINI 0.4 nozzle.json
# resources/profiles/Prusa/machine/Prusa MK3S 0.4 nozzle.json
# resources/profiles/Qidi/machine/Qidi X-CF Pro 0.4 nozzle.json
# resources/profiles/Qidi/machine/Qidi X-Max 0.4 nozzle.json
# resources/profiles/Qidi/machine/Qidi X-Max 3 0.4 nozzle.json
# resources/profiles/Qidi/machine/Qidi X-Plus 0.4 nozzle.json
# resources/profiles/Qidi/machine/Qidi X-Plus 3 0.4 nozzle.json
# resources/profiles/Qidi/machine/Qidi X-Smart 3 0.4 nozzle.json
# resources/profiles/Tronxy.json
# resources/profiles/Tronxy/machine/Tronxy X5SA 400 0.4 nozzle.json
# resources/profiles/Tronxy/process/0.08mm Extra Fine @Tronxy.json
# resources/profiles/Tronxy/process/0.12mm Fine @Tronxy.json
# resources/profiles/Tronxy/process/0.15mm Optimal @Tronxy.json
# resources/profiles/Tronxy/process/0.20mm Standard @Tronxy.json
# resources/profiles/Tronxy/process/0.24mm Draft @Tronxy.json
# resources/profiles/Tronxy/process/0.28mm Extra Draft @Tronxy.json
# resources/profiles/Voxelab/machine/Voxelab Aquila X2 0.4 nozzle.json
# resources/web/data/text.js
# src/OrcaSlicer.cpp
# src/libslic3r/GCode.cpp
# src/libslic3r/GCode/SeamPlacer.cpp
# src/libslic3r/GCode/SeamPlacer.hpp
# src/libslic3r/GCodeWriter.cpp
# src/libslic3r/GCodeWriter.hpp
# src/libslic3r/Preset.cpp
# src/libslic3r/PresetBundle.cpp
# src/libslic3r/Print.cpp
# src/libslic3r/PrintConfig.cpp
# src/libslic3r/PrintConfig.hpp
# src/libslic3r/TreeSupport.cpp
# src/libslic3r/calib.cpp
# src/libslic3r/calib.hpp
# src/slic3r/GUI/BackgroundSlicingProcess.cpp
# src/slic3r/GUI/BedShapeDialog.cpp
# src/slic3r/GUI/ConfigManipulation.cpp
# src/slic3r/GUI/GUI.cpp
# src/slic3r/GUI/GUI_App.cpp
# src/slic3r/GUI/GUI_Factories.cpp
# src/slic3r/GUI/GUI_ObjectList.cpp
# src/slic3r/GUI/Jobs/ArrangeJob.cpp
# src/slic3r/GUI/OptionsGroup.cpp
# src/slic3r/GUI/PartPlate.cpp
# src/slic3r/GUI/PartPlate.hpp
# src/slic3r/GUI/Plater.cpp
# src/slic3r/GUI/StatusPanel.cpp
# src/slic3r/GUI/Tab.cpp
# src/slic3r/GUI/Widgets/AMSControl.hpp
# version.inc
2023-09-29 19:46:49 +08:00
Arthur
0b4b6cde4f
ENH: sync master with auto-arranging and brim
...
auto-arranging considers wipe tower from smooth timelapse
Change-Id: I5dd72260c777abfd2894776b2588bb3ff4224416
2023-09-22 16:21:26 +08:00
chunmao.guo
e789489ed9
NEW: add best_object_pos for auto-arranging
...
For i3 printers, best object position may not be the bed center,
we need to align objects to the specified best_object_pos.
Jira: STUDIO-4133
Change-Id: I06e31e597d2dd8288eb24a52d836cc8a134a4111
2023-09-22 16:21:26 +08:00
SoftFever
2a478ab4f9
post changes after merging BS1.7.4
...
Remove tracking etc..
2023-08-26 18:45:43 +08:00
manch1n
4db1a6d46e
ENH: allow big obj arrange into bed with calibration region
...
Change-Id: I4dac878e0c5ec75a4b06dd5803c0a4839f312bfe
(cherry picked from commit b216a5f4ae97b29eb5ba0c2b5de3b12da80f374d)
2023-07-07 17:25:51 +08:00
manch1n
f49c151611
FIX: avoid arrange to nonprefered region
...
Previously we assume the NFP of exclude regions are rectangle, which was
not always right. Now we calculate the NFP and find a best new position
to shift.
Change-Id: I02c075603cf71dd3c9146d7ac7a6706c0f850669
(cherry picked from commit 713ebd666c90d5dcfaf89914c37d211e9a470e99)
2023-04-17 15:39:02 +08:00
manch1n
229b173894
FIX: arrangement crash due to mutithread call to transformedShape
...
STUDIO-2653
Change-Id: I82031d3adbd95f8af04cb5f15b39d0621a40c7f3
(cherry picked from commit 065575c4845688ecb6293fa826e5f987f019d9fb)
2023-04-17 15:39:02 +08:00
manch1n
dd473bdc3f
FIX: avoid wipe tower conflict with objects
...
Use a more accurate way to estimate wipe tower:
1. read wipe configure from front-end (the positions may be different at
different plates).
2. when depth is unavailable, use all materials to estimate depth (the
estimated wipe tower may be larger than the actual generated one).
Change-Id: I42ffd03d9817b57f5023a6820cda0032509c6fe5
(cherry picked from commit 77ba9757023afb9160c996eeea6ead8a27b50ce4)
2023-04-17 15:39:02 +08:00
manch1n
62a2fadeb8
ENH: make arrangement align better
...
Jira: STUDIO-2584, STUDIO-2507
Change-Id: I1987103e46f5ecb84395b5885954679ffe105c60
(cherry picked from commit 90df278408b79ad5b8d4ceaf90fe483cd8f5a48c)
2023-04-17 15:39:02 +08:00
manch1n
797c211203
ENH:allow more same color objects arrange together
...
Change-Id: I87a9de3c5ed540c87fdebfe4e69ffa539d78ce40
STUDIO-2462
STUDIO-2463
2023-04-17 15:39:02 +08:00
Arthur
59f7c4595c
FIX: arranging multi-color objects not correct
...
Arranging multi-color objects with disabled
multi_materials_on_same_plate option was not currect.
Previously we only consider the first extruder id for multi-color
objects. Now we consider all extruders.
Jira: STUDIO-2164
Change-Id: If64ff4f88f0fe4f6c31ebf657b3449b19bf063f0
(cherry picked from commit f4f6bdd00a0c3d3e13406b69be9b5b0468b27d44)
2023-02-22 20:09:17 +08:00
miaoxin
9857f7384b
ENH: auto-arrange uses inner NFP to simplify fixed_overfit
...
1. Add inner nfp algo.The final nfp result is inner nfp subtract outer nfp.
2. Leave 5(scaled) room in inflation to allow numeric float eps.
Change-Id: I6be0b205c9811af24a238352b256bf1399ee3716
(cherry picked from commit dbab96efc7bfa16afd9db9607b862886606b0aa0)
2022-12-15 04:38:15 -05:00
Arthur
4eba8a2a2d
FIX: auto-arrange may crash due to clipper
...
1. Use nlopt and clipper offset togather seems not stable, very easy to
crash. We do the offset outside nlopt now.
2. Fix a bug with finalAlign where objects may be translated to overlap
with excluded region.
3. change the words of support_expansion
Change-Id: I22e37b20e4ae16f47bde206de90845616e4cefad
(cherry picked from commit 1c26e5d2862fd3f3292971b5c749420bfb2cdf0e)
2022-12-15 04:38:15 -05:00
Arthur
5fa771c6cb
ENH: improve auto-arrange in several ways
...
1. reduce expansion of exclusion regions
2. expand extrusion calib regions to let them touch bed boundary, to
greately simplify auto-arranging with avoidance option on
3. improve dist_for_BOTTOM_LEFT to allow objects be put left to
exclusion regions temporarily
4. improve on_preload for better handling objects around exclusion regions.
5. improve debug tools
6. fix a bug with wipe tower estimation (don't estimate if wipe tower is
explicitly disabled)
7. use larger y-overlap threshold to estimate rod height confliction
better in per-object print ordering (now we use half the clearance
radius)
Change-Id: Iab29d47a072d8515f28a09855432f92fcffa8c5f
(cherry picked from commit 3a4f242a3a6fd2f82dcc8306cde4d1cb107a5099)
2022-12-15 04:33:48 -05:00
Arthur
8dd401d35f
FIX: auto-arrange reads wrongs first_bed_temp
...
Also change words for extruder clearance parameters.
Change-Id: I736fd9049d184c140b33078d78f764b4fe172765
(cherry picked from commit e70c0c0ea133cffa5788efbfc9633332b196e8df)
2022-11-01 20:52:23 +08:00
Arthur
c9e8ef3f93
FIX: fix two tree support bugs
...
1. hybrid(auto) on_buildplate_only option not working correctly because
parent is not set.
2. tree(auto) on_buildplate_only not working correctly because unsupported
branch isn't deleted completely. I add child to track the dangling nodes
and then delete nodes with no child.
Change-Id: I24c69a7cf400d2961b22a720a6069cf95db6c1a5
(cherry picked from commit bce77c16128d35c668b175e7135b9fe9acd71d13)
2022-10-09 10:37:45 +08:00
arthur
35d6e048ff
FIX: auto-arrange fails in several cases
...
Jira: STUDIO-644, STUDIO-661
Change-Id: I3cd1fcd4e1fabf9a401c9fd536e8f55592775fbd
2022-09-02 12:52:18 +08:00
Arthur
d95e85851c
FIX: auto-arrange fails for multi-color objects
...
The cost for switching extruders was too big.
Change-Id: Ic9de6b6aabb7e69db79a0201f0dbb9d039097df9
2022-08-26 09:25:59 +08:00
Arthur
07ae246e5f
ENH: disable arranging selected items
...
0. disable arranging selected
1. fix bug where brim is not correct.
2. fix bug where big circle objects are not arranged properly
3. disable default enable_rotation
Change-Id: Ifc69f35d900ff63ec1e9ec8bf8638afc6ea7d54b
(cherry picked from commit 2ed1b0dd8573a1e10aaf77f0d9f8896cef304427)
2022-08-05 16:11:42 +08:00
lane.wei
1555904bef
Add the full source of BambuStudio
...
using version 1.0.10
2022-07-15 23:42:08 +08:00
