From 6ae89f7d9b66e915f97d5771d1a718d7848d607f Mon Sep 17 00:00:00 2001 From: SoftFever Date: Sun, 17 Aug 2025 23:49:06 +0800 Subject: [PATCH] rename 2DHoneycomb and 2DLattice to LateralHoneycomb and LateralLattice (#10423) * rename 2DHoneycomb and 2DLattice to LateralHoneycomb and LateralLattice * more renaming --- localization/i18n/OrcaSlicer.pot | 12 ++++---- localization/i18n/ca/OrcaSlicer_ca.po | 12 ++++---- localization/i18n/cs/OrcaSlicer_cs.po | 12 ++++---- localization/i18n/de/OrcaSlicer_de.po | 12 ++++---- localization/i18n/en/OrcaSlicer_en.po | 12 ++++---- localization/i18n/es/OrcaSlicer_es.po | 12 ++++---- localization/i18n/fr/OrcaSlicer_fr.po | 12 ++++---- localization/i18n/hu/OrcaSlicer_hu.po | 12 ++++---- localization/i18n/it/OrcaSlicer_it.po | 12 ++++---- localization/i18n/ja/OrcaSlicer_ja.po | 12 ++++---- localization/i18n/ko/OrcaSlicer_ko.po | 12 ++++---- localization/i18n/lt/OrcaSlicer_lt.po | 12 ++++---- localization/i18n/nl/OrcaSlicer_nl.po | 12 ++++---- localization/i18n/pl/OrcaSlicer_pl.po | 12 ++++---- localization/i18n/pt_BR/OrcaSlicer_pt_BR.po | 12 ++++---- localization/i18n/ru/OrcaSlicer_ru.po | 12 ++++---- localization/i18n/sv/OrcaSlicer_sv.po | 12 ++++---- localization/i18n/tr/OrcaSlicer_tr.po | 12 ++++---- localization/i18n/uk/OrcaSlicer_uk.po | 12 ++++---- localization/i18n/zh_CN/OrcaSlicer_zh_CN.po | 12 ++++---- localization/i18n/zh_TW/OrcaSlicer_zh_TW.po | 12 ++++---- ...eycomb.svg => param_lateral-honeycomb.svg} | 0 ...dlattice.svg => param_lateral-lattice.svg} | 0 src/libslic3r/Fill/Fill.cpp | 30 +++++++++---------- src/libslic3r/Fill/FillBase.cpp | 4 +-- src/libslic3r/Fill/FillBase.hpp | 8 ++--- src/libslic3r/Fill/FillRectilinear.cpp | 18 +++++------ src/libslic3r/Fill/FillRectilinear.hpp | 12 ++++---- src/libslic3r/Layer.cpp | 4 +-- src/libslic3r/Preset.cpp | 2 +- src/libslic3r/PrintConfig.cpp | 24 +++++++-------- src/libslic3r/PrintConfig.hpp | 6 ++-- src/libslic3r/PrintObject.cpp | 8 ++--- src/slic3r/GUI/ConfigManipulation.cpp | 8 ++--- src/slic3r/GUI/GUI_Factories.cpp | 2 +- src/slic3r/GUI/Tab.cpp | 4 +-- 36 files changed, 191 insertions(+), 191 deletions(-) rename resources/images/{param_2dhoneycomb.svg => param_lateral-honeycomb.svg} (100%) rename resources/images/{param_2dlattice.svg => param_lateral-lattice.svg} (100%) diff --git a/localization/i18n/OrcaSlicer.pot b/localization/i18n/OrcaSlicer.pot index 2183e110d8..c5224491b3 100644 --- a/localization/i18n/OrcaSlicer.pot +++ b/localization/i18n/OrcaSlicer.pot @@ -10771,10 +10771,10 @@ msgstr "" msgid "3D Honeycomb" msgstr "" -msgid "2D Honeycomb" +msgid "Lateral Honeycomb" msgstr "" -msgid "2D Lattice" +msgid "Lateral Lattice" msgstr "" msgid "Cross Hatch" @@ -10789,19 +10789,19 @@ msgstr "" msgid "Gyroid" msgstr "" -msgid "Lattice angle 1" +msgid "Lateral lattice angle 1" msgstr "" msgid "" -"The angle of the first set of 2D lattice elements in the Z direction. Zero " +"The angle of the first set of Lateral lattice elements in the Z direction. Zero " "is vertical." msgstr "" -msgid "Lattice angle 2" +msgid "Lateral lattice angle 2" msgstr "" msgid "" -"The angle of the second set of 2D lattice elements in the Z direction. Zero " +"The angle of the second set of Lateral lattice elements in the Z direction. Zero " "is vertical." msgstr "" diff --git a/localization/i18n/ca/OrcaSlicer_ca.po b/localization/i18n/ca/OrcaSlicer_ca.po index 20444ca92f..d2a9f65332 100644 --- a/localization/i18n/ca/OrcaSlicer_ca.po +++ b/localization/i18n/ca/OrcaSlicer_ca.po @@ -12286,10 +12286,10 @@ msgstr "Panal d'abella" msgid "3D Honeycomb" msgstr "Panal d'abella 3D" -msgid "2D Honeycomb" +msgid "Lateral Honeycomb" msgstr "" -msgid "2D Lattice" +msgid "Lateral Lattice" msgstr "Gelosia 2D" msgid "Cross Hatch" @@ -12304,21 +12304,21 @@ msgstr "" msgid "Gyroid" msgstr "Giroide" -msgid "Lattice angle 1" +msgid "Lateral lattice angle 1" msgstr "Angle de gelosia 1" msgid "" -"The angle of the first set of 2D lattice elements in the Z direction. Zero " +"The angle of the first set of Lateral lattice elements in the Z direction. Zero " "is vertical." msgstr "" "L'angle del primer conjunt d'elements de gelosia 2D en la direcció Z. El " "zero és vertical." -msgid "Lattice angle 2" +msgid "Lateral lattice angle 2" msgstr "Angle de gelosia 2" msgid "" -"The angle of the second set of 2D lattice elements in the Z direction. Zero " +"The angle of the second set of Lateral lattice elements in the Z direction. Zero " "is vertical." msgstr "" "L'angle del segon conjunt d'elements de gelosia 2D en la direcció Z. El zero " diff --git a/localization/i18n/cs/OrcaSlicer_cs.po b/localization/i18n/cs/OrcaSlicer_cs.po index d409121a80..4d22297470 100644 --- a/localization/i18n/cs/OrcaSlicer_cs.po +++ b/localization/i18n/cs/OrcaSlicer_cs.po @@ -11509,10 +11509,10 @@ msgstr "Plástev" msgid "3D Honeycomb" msgstr "3D Plástev" -msgid "2D Honeycomb" +msgid "Lateral Honeycomb" msgstr "" -msgid "2D Lattice" +msgid "Lateral Lattice" msgstr "" msgid "Cross Hatch" @@ -11527,19 +11527,19 @@ msgstr "" msgid "Gyroid" msgstr "Gyroid" -msgid "Lattice angle 1" +msgid "Lateral lattice angle 1" msgstr "" msgid "" -"The angle of the first set of 2D lattice elements in the Z direction. Zero " +"The angle of the first set of Lateral lattice elements in the Z direction. Zero " "is vertical." msgstr "" -msgid "Lattice angle 2" +msgid "Lateral lattice angle 2" msgstr "" msgid "" -"The angle of the second set of 2D lattice elements in the Z direction. Zero " +"The angle of the second set of Lateral lattice elements in the Z direction. Zero " "is vertical." msgstr "" diff --git a/localization/i18n/de/OrcaSlicer_de.po b/localization/i18n/de/OrcaSlicer_de.po index 3dbd5b07dd..30c053860a 100644 --- a/localization/i18n/de/OrcaSlicer_de.po +++ b/localization/i18n/de/OrcaSlicer_de.po @@ -12433,10 +12433,10 @@ msgstr "Bienenwabe" msgid "3D Honeycomb" msgstr "3D-Waben" -msgid "2D Honeycomb" +msgid "Lateral Honeycomb" msgstr "2D-Waben" -msgid "2D Lattice" +msgid "Lateral Lattice" msgstr "2D-Gitter" msgid "Cross Hatch" @@ -12451,21 +12451,21 @@ msgstr "" msgid "Gyroid" msgstr "Gyroid" -msgid "Lattice angle 1" +msgid "Lateral lattice angle 1" msgstr "Gitterwinkel 1" msgid "" -"The angle of the first set of 2D lattice elements in the Z direction. Zero " +"The angle of the first set of Lateral lattice elements in the Z direction. Zero " "is vertical." msgstr "" "Der Winkel des ersten Satzes von 2D-Gitterelementen in der Z-Richtung. Null " "ist vertikal." -msgid "Lattice angle 2" +msgid "Lateral lattice angle 2" msgstr "Gitterwinkel 2" msgid "" -"The angle of the second set of 2D lattice elements in the Z direction. Zero " +"The angle of the second set of Lateral lattice elements in the Z direction. Zero " "is vertical." msgstr "" "Der Winkel des zweiten Satzes von 2D-Gitterelementen in der Z-Richtung. Null " diff --git a/localization/i18n/en/OrcaSlicer_en.po b/localization/i18n/en/OrcaSlicer_en.po index ea29534770..6ac6c793fc 100644 --- a/localization/i18n/en/OrcaSlicer_en.po +++ b/localization/i18n/en/OrcaSlicer_en.po @@ -11061,10 +11061,10 @@ msgstr "" msgid "3D Honeycomb" msgstr "" -msgid "2D Honeycomb" +msgid "Lateral Honeycomb" msgstr "" -msgid "2D Lattice" +msgid "Lateral Lattice" msgstr "" msgid "Cross Hatch" @@ -11079,19 +11079,19 @@ msgstr "" msgid "Gyroid" msgstr "" -msgid "Lattice angle 1" +msgid "Lateral lattice angle 1" msgstr "" msgid "" -"The angle of the first set of 2D lattice elements in the Z direction. Zero " +"The angle of the first set of Lateral lattice elements in the Z direction. Zero " "is vertical." msgstr "" -msgid "Lattice angle 2" +msgid "Lateral lattice angle 2" msgstr "" msgid "" -"The angle of the second set of 2D lattice elements in the Z direction. Zero " +"The angle of the second set of Lateral lattice elements in the Z direction. Zero " "is vertical." msgstr "" diff --git a/localization/i18n/es/OrcaSlicer_es.po b/localization/i18n/es/OrcaSlicer_es.po index 0622e4473e..5c3692c18a 100644 --- a/localization/i18n/es/OrcaSlicer_es.po +++ b/localization/i18n/es/OrcaSlicer_es.po @@ -12200,10 +12200,10 @@ msgstr "Panal de abeja" msgid "3D Honeycomb" msgstr "Panal 3D" -msgid "2D Honeycomb" +msgid "Lateral Honeycomb" msgstr "" -msgid "2D Lattice" +msgid "Lateral Lattice" msgstr "" msgid "Cross Hatch" @@ -12218,19 +12218,19 @@ msgstr "" msgid "Gyroid" msgstr "Giroide" -msgid "Lattice angle 1" +msgid "Lateral lattice angle 1" msgstr "" msgid "" -"The angle of the first set of 2D lattice elements in the Z direction. Zero " +"The angle of the first set of Lateral lattice elements in the Z direction. Zero " "is vertical." msgstr "" -msgid "Lattice angle 2" +msgid "Lateral lattice angle 2" msgstr "" msgid "" -"The angle of the second set of 2D lattice elements in the Z direction. Zero " +"The angle of the second set of Lateral lattice elements in the Z direction. Zero " "is vertical." msgstr "" diff --git a/localization/i18n/fr/OrcaSlicer_fr.po b/localization/i18n/fr/OrcaSlicer_fr.po index 14d0f43768..c2d27a715d 100644 --- a/localization/i18n/fr/OrcaSlicer_fr.po +++ b/localization/i18n/fr/OrcaSlicer_fr.po @@ -12444,10 +12444,10 @@ msgstr "Nid d'abeille" msgid "3D Honeycomb" msgstr "Nid d'abeille 3D" -msgid "2D Honeycomb" +msgid "Lateral Honeycomb" msgstr "" -msgid "2D Lattice" +msgid "Lateral Lattice" msgstr "Treillis 2D" msgid "Cross Hatch" @@ -12462,21 +12462,21 @@ msgstr "" msgid "Gyroid" msgstr "Gyroïde" -msgid "Lattice angle 1" +msgid "Lateral lattice angle 1" msgstr "Angle de treillis 1" msgid "" -"The angle of the first set of 2D lattice elements in the Z direction. Zero " +"The angle of the first set of Lateral lattice elements in the Z direction. Zero " "is vertical." msgstr "" "Angle du premier ensemble d’éléments de treillis 2D dans la direction Z. " "Zéro correspond à la verticale." -msgid "Lattice angle 2" +msgid "Lateral lattice angle 2" msgstr "Angle de treillis 2" msgid "" -"The angle of the second set of 2D lattice elements in the Z direction. Zero " +"The angle of the second set of Lateral lattice elements in the Z direction. Zero " "is vertical." msgstr "" "Angle de la deuxième série d’éléments de treillis 2D dans la direction Z. " diff --git a/localization/i18n/hu/OrcaSlicer_hu.po b/localization/i18n/hu/OrcaSlicer_hu.po index a767fa61e5..24945d0925 100644 --- a/localization/i18n/hu/OrcaSlicer_hu.po +++ b/localization/i18n/hu/OrcaSlicer_hu.po @@ -11377,10 +11377,10 @@ msgstr "Méhsejt" msgid "3D Honeycomb" msgstr "3D-méhsejt" -msgid "2D Honeycomb" +msgid "Lateral Honeycomb" msgstr "" -msgid "2D Lattice" +msgid "Lateral Lattice" msgstr "" msgid "Cross Hatch" @@ -11395,19 +11395,19 @@ msgstr "" msgid "Gyroid" msgstr "Gyroid" -msgid "Lattice angle 1" +msgid "Lateral lattice angle 1" msgstr "" msgid "" -"The angle of the first set of 2D lattice elements in the Z direction. Zero " +"The angle of the first set of Lateral lattice elements in the Z direction. Zero " "is vertical." msgstr "" -msgid "Lattice angle 2" +msgid "Lateral lattice angle 2" msgstr "" msgid "" -"The angle of the second set of 2D lattice elements in the Z direction. Zero " +"The angle of the second set of Lateral lattice elements in the Z direction. Zero " "is vertical." msgstr "" diff --git a/localization/i18n/it/OrcaSlicer_it.po b/localization/i18n/it/OrcaSlicer_it.po index 26663ac922..950c1e51ba 100644 --- a/localization/i18n/it/OrcaSlicer_it.po +++ b/localization/i18n/it/OrcaSlicer_it.po @@ -12359,10 +12359,10 @@ msgstr "Nido d'ape" msgid "3D Honeycomb" msgstr "Nido d'ape 3D" -msgid "2D Honeycomb" +msgid "Lateral Honeycomb" msgstr "" -msgid "2D Lattice" +msgid "Lateral Lattice" msgstr "Reticolo 2D" msgid "Cross Hatch" @@ -12377,21 +12377,21 @@ msgstr "" msgid "Gyroid" msgstr "Giroide" -msgid "Lattice angle 1" +msgid "Lateral lattice angle 1" msgstr "Angolo reticolo 1" msgid "" -"The angle of the first set of 2D lattice elements in the Z direction. Zero " +"The angle of the first set of Lateral lattice elements in the Z direction. Zero " "is vertical." msgstr "" "L'angolo della prima serie di elementi reticolari 2D nell'asse Z. Zero è " "verticale." -msgid "Lattice angle 2" +msgid "Lateral lattice angle 2" msgstr "Angolo reticolo 2" msgid "" -"The angle of the second set of 2D lattice elements in the Z direction. Zero " +"The angle of the second set of Lateral lattice elements in the Z direction. Zero " "is vertical." msgstr "" "L'angolo della seconda serie di elementi reticolari 2D nell'asse Z. Zero è " diff --git a/localization/i18n/ja/OrcaSlicer_ja.po b/localization/i18n/ja/OrcaSlicer_ja.po index cc811385c4..737546b5de 100644 --- a/localization/i18n/ja/OrcaSlicer_ja.po +++ b/localization/i18n/ja/OrcaSlicer_ja.po @@ -11112,10 +11112,10 @@ msgstr "ハニカム" msgid "3D Honeycomb" msgstr "3D ハニカム" -msgid "2D Honeycomb" +msgid "Lateral Honeycomb" msgstr "" -msgid "2D Lattice" +msgid "Lateral Lattice" msgstr "" msgid "Cross Hatch" @@ -11130,19 +11130,19 @@ msgstr "" msgid "Gyroid" msgstr "ジャイロイド" -msgid "Lattice angle 1" +msgid "Lateral lattice angle 1" msgstr "" msgid "" -"The angle of the first set of 2D lattice elements in the Z direction. Zero " +"The angle of the first set of Lateral lattice elements in the Z direction. Zero " "is vertical." msgstr "" -msgid "Lattice angle 2" +msgid "Lateral lattice angle 2" msgstr "" msgid "" -"The angle of the second set of 2D lattice elements in the Z direction. Zero " +"The angle of the second set of Lateral lattice elements in the Z direction. Zero " "is vertical." msgstr "" diff --git a/localization/i18n/ko/OrcaSlicer_ko.po b/localization/i18n/ko/OrcaSlicer_ko.po index 7f0bac8d15..03c33402f0 100644 --- a/localization/i18n/ko/OrcaSlicer_ko.po +++ b/localization/i18n/ko/OrcaSlicer_ko.po @@ -11780,10 +11780,10 @@ msgstr "벌집" msgid "3D Honeycomb" msgstr "3D 벌집" -msgid "2D Honeycomb" +msgid "Lateral Honeycomb" msgstr "" -msgid "2D Lattice" +msgid "Lateral Lattice" msgstr "2D 격자" msgid "Cross Hatch" @@ -11798,19 +11798,19 @@ msgstr "" msgid "Gyroid" msgstr "자이로이드" -msgid "Lattice angle 1" +msgid "Lateral lattice angle 1" msgstr "격자 각도 1" msgid "" -"The angle of the first set of 2D lattice elements in the Z direction. Zero " +"The angle of the first set of Lateral lattice elements in the Z direction. Zero " "is vertical." msgstr "Z 방향의 첫 번째 2D 격자 요소 집합의 각도입니다. 0은 수직입니다." -msgid "Lattice angle 2" +msgid "Lateral lattice angle 2" msgstr "격자 각도 2" msgid "" -"The angle of the second set of 2D lattice elements in the Z direction. Zero " +"The angle of the second set of Lateral lattice elements in the Z direction. Zero " "is vertical." msgstr "Z 방향에서 두 번째 2D 격자 요소 세트의 각도입니다. 0은 수직입니다." diff --git a/localization/i18n/lt/OrcaSlicer_lt.po b/localization/i18n/lt/OrcaSlicer_lt.po index b9e6c824a9..51c40b8b6d 100644 --- a/localization/i18n/lt/OrcaSlicer_lt.po +++ b/localization/i18n/lt/OrcaSlicer_lt.po @@ -12159,10 +12159,10 @@ msgstr "Korys" msgid "3D Honeycomb" msgstr "3D korys" -msgid "2D Honeycomb" +msgid "Lateral Honeycomb" msgstr "" -msgid "2D Lattice" +msgid "Lateral Lattice" msgstr "2D grotelės" msgid "Cross Hatch" @@ -12177,21 +12177,21 @@ msgstr "" msgid "Gyroid" msgstr "Giroidas" -msgid "Lattice angle 1" +msgid "Lateral lattice angle 1" msgstr "Rašto kampas 1" msgid "" -"The angle of the first set of 2D lattice elements in the Z direction. Zero " +"The angle of the first set of Lateral lattice elements in the Z direction. Zero " "is vertical." msgstr "" "Pirmojo 2D grotelių elementų rinkinio kampas Z kryptimi. Nulis yra " "vertikalus." -msgid "Lattice angle 2" +msgid "Lateral lattice angle 2" msgstr "Rašto kampas 2" msgid "" -"The angle of the second set of 2D lattice elements in the Z direction. Zero " +"The angle of the second set of Lateral lattice elements in the Z direction. Zero " "is vertical." msgstr "" "Antrojo 2D grotelių elementų rinkinio kampas Z kryptimi. Nulis yra " diff --git a/localization/i18n/nl/OrcaSlicer_nl.po b/localization/i18n/nl/OrcaSlicer_nl.po index b890d03f9d..bf5e9a64b4 100644 --- a/localization/i18n/nl/OrcaSlicer_nl.po +++ b/localization/i18n/nl/OrcaSlicer_nl.po @@ -11548,10 +11548,10 @@ msgstr "Honinggraad" msgid "3D Honeycomb" msgstr "3D Honingraat" -msgid "2D Honeycomb" +msgid "Lateral Honeycomb" msgstr "" -msgid "2D Lattice" +msgid "Lateral Lattice" msgstr "" msgid "Cross Hatch" @@ -11566,19 +11566,19 @@ msgstr "" msgid "Gyroid" msgstr "Gyroide" -msgid "Lattice angle 1" +msgid "Lateral lattice angle 1" msgstr "" msgid "" -"The angle of the first set of 2D lattice elements in the Z direction. Zero " +"The angle of the first set of Lateral lattice elements in the Z direction. Zero " "is vertical." msgstr "" -msgid "Lattice angle 2" +msgid "Lateral lattice angle 2" msgstr "" msgid "" -"The angle of the second set of 2D lattice elements in the Z direction. Zero " +"The angle of the second set of Lateral lattice elements in the Z direction. Zero " "is vertical." msgstr "" diff --git a/localization/i18n/pl/OrcaSlicer_pl.po b/localization/i18n/pl/OrcaSlicer_pl.po index e0d15b5fc5..38b6ec1a6d 100644 --- a/localization/i18n/pl/OrcaSlicer_pl.po +++ b/localization/i18n/pl/OrcaSlicer_pl.po @@ -12210,10 +12210,10 @@ msgstr "Plaster miodu" msgid "3D Honeycomb" msgstr "Plaster miodu 3D" -msgid "2D Honeycomb" +msgid "Lateral Honeycomb" msgstr "" -msgid "2D Lattice" +msgid "Lateral Lattice" msgstr "Siatka 2D" msgid "Cross Hatch" @@ -12228,21 +12228,21 @@ msgstr "" msgid "Gyroid" msgstr "Gyroidalny" -msgid "Lattice angle 1" +msgid "Lateral lattice angle 1" msgstr "Kąt siatki 1" msgid "" -"The angle of the first set of 2D lattice elements in the Z direction. Zero " +"The angle of the first set of Lateral lattice elements in the Z direction. Zero " "is vertical." msgstr "" "Kąt nachylenia pierwszej linii dla wzorca wypełnienia „siatka 2D” względem " "osi Z. Zero oznacza pionową." -msgid "Lattice angle 2" +msgid "Lateral lattice angle 2" msgstr "Kąt siatki 2" msgid "" -"The angle of the second set of 2D lattice elements in the Z direction. Zero " +"The angle of the second set of Lateral lattice elements in the Z direction. Zero " "is vertical." msgstr "" "Kąt nachylenia drugiej linii dla wzorca wypełnienia \"2D siatka\" względem " diff --git a/localization/i18n/pt_BR/OrcaSlicer_pt_BR.po b/localization/i18n/pt_BR/OrcaSlicer_pt_BR.po index 7cf34aabe7..6d4d6ed665 100644 --- a/localization/i18n/pt_BR/OrcaSlicer_pt_BR.po +++ b/localization/i18n/pt_BR/OrcaSlicer_pt_BR.po @@ -12250,10 +12250,10 @@ msgstr "Favo de Mel" msgid "3D Honeycomb" msgstr "Favo de Mel 3D" -msgid "2D Honeycomb" +msgid "Lateral Honeycomb" msgstr "" -msgid "2D Lattice" +msgid "Lateral Lattice" msgstr "Treliça 2D" msgid "Cross Hatch" @@ -12268,21 +12268,21 @@ msgstr "" msgid "Gyroid" msgstr "Giroide" -msgid "Lattice angle 1" +msgid "Lateral lattice angle 1" msgstr "Ângulo de treliça 1" msgid "" -"The angle of the first set of 2D lattice elements in the Z direction. Zero " +"The angle of the first set of Lateral lattice elements in the Z direction. Zero " "is vertical." msgstr "" "O ângulo do primeiro conjunto de elementos de treliça 2D na direção Z. Zero " "é vertical." -msgid "Lattice angle 2" +msgid "Lateral lattice angle 2" msgstr "Ângulo de treliça 2" msgid "" -"The angle of the second set of 2D lattice elements in the Z direction. Zero " +"The angle of the second set of Lateral lattice elements in the Z direction. Zero " "is vertical." msgstr "" "O ângulo do segundo conjunto de elementos de treliça 2D na direção Z. Zero é " diff --git a/localization/i18n/ru/OrcaSlicer_ru.po b/localization/i18n/ru/OrcaSlicer_ru.po index 6e82b51d90..fd5dd72d9a 100644 --- a/localization/i18n/ru/OrcaSlicer_ru.po +++ b/localization/i18n/ru/OrcaSlicer_ru.po @@ -12413,10 +12413,10 @@ msgstr "Соты" msgid "3D Honeycomb" msgstr "3D соты" -msgid "2D Honeycomb" +msgid "Lateral Honeycomb" msgstr "" -msgid "2D Lattice" +msgid "Lateral Lattice" msgstr "2D решётка" msgid "Cross Hatch" @@ -12431,21 +12431,21 @@ msgstr "" msgid "Gyroid" msgstr "Гироид" -msgid "Lattice angle 1" +msgid "Lateral lattice angle 1" msgstr "Угол №1 (2D решётка)" msgid "" -"The angle of the first set of 2D lattice elements in the Z direction. Zero " +"The angle of the first set of Lateral lattice elements in the Z direction. Zero " "is vertical." msgstr "" "Угол наклона первой линии для шаблона заполнения «2D решётка» относительно " "вертикальной оси Z (0 - вертикально)." -msgid "Lattice angle 2" +msgid "Lateral lattice angle 2" msgstr "Угол №2 (2D решётка)" msgid "" -"The angle of the second set of 2D lattice elements in the Z direction. Zero " +"The angle of the second set of Lateral lattice elements in the Z direction. Zero " "is vertical." msgstr "" "Угол наклона второй линии для шаблона заполнения «2D решётка» относительно " diff --git a/localization/i18n/sv/OrcaSlicer_sv.po b/localization/i18n/sv/OrcaSlicer_sv.po index 79c7972267..e6486ca117 100644 --- a/localization/i18n/sv/OrcaSlicer_sv.po +++ b/localization/i18n/sv/OrcaSlicer_sv.po @@ -11320,10 +11320,10 @@ msgstr "Honeycomb" msgid "3D Honeycomb" msgstr "3D Honeycomb" -msgid "2D Honeycomb" +msgid "Lateral Honeycomb" msgstr "" -msgid "2D Lattice" +msgid "Lateral Lattice" msgstr "" msgid "Cross Hatch" @@ -11338,19 +11338,19 @@ msgstr "" msgid "Gyroid" msgstr "Gyroid" -msgid "Lattice angle 1" +msgid "Lateral lattice angle 1" msgstr "" msgid "" -"The angle of the first set of 2D lattice elements in the Z direction. Zero " +"The angle of the first set of Lateral lattice elements in the Z direction. Zero " "is vertical." msgstr "" -msgid "Lattice angle 2" +msgid "Lateral lattice angle 2" msgstr "" msgid "" -"The angle of the second set of 2D lattice elements in the Z direction. Zero " +"The angle of the second set of Lateral lattice elements in the Z direction. Zero " "is vertical." msgstr "" diff --git a/localization/i18n/tr/OrcaSlicer_tr.po b/localization/i18n/tr/OrcaSlicer_tr.po index 25e4c1caec..550192903d 100644 --- a/localization/i18n/tr/OrcaSlicer_tr.po +++ b/localization/i18n/tr/OrcaSlicer_tr.po @@ -12080,10 +12080,10 @@ msgstr "Petek" msgid "3D Honeycomb" msgstr "3D petek" -msgid "2D Honeycomb" +msgid "Lateral Honeycomb" msgstr "2D petek" -msgid "2D Lattice" +msgid "Lateral Lattice" msgstr "2D Kafes" msgid "Cross Hatch" @@ -12098,20 +12098,20 @@ msgstr "Tpms-fk" msgid "Gyroid" msgstr "Jiroid" -msgid "Lattice angle 1" +msgid "Lateral lattice angle 1" msgstr "Kafes açısı 1" msgid "" -"The angle of the first set of 2D lattice elements in the Z direction. Zero is " +"The angle of the first set of Lateral lattice elements in the Z direction. Zero is " "vertical." msgstr "" "İlk 2 boyutlu kafes elemanları grubunun Z yönündeki açısı. Sıfır dikeydir." -msgid "Lattice angle 2" +msgid "Lateral lattice angle 2" msgstr "Kafes açısı 2" msgid "" -"The angle of the second set of 2D lattice elements in the Z direction. Zero is " +"The angle of the second set of Lateral lattice elements in the Z direction. Zero is " "vertical." msgstr "" "İkinci 2 boyutlu kafes elemanları grubunun Z yönündeki açısı. Sıfır dikeydir." diff --git a/localization/i18n/uk/OrcaSlicer_uk.po b/localization/i18n/uk/OrcaSlicer_uk.po index 653c1467c4..99500722fb 100644 --- a/localization/i18n/uk/OrcaSlicer_uk.po +++ b/localization/i18n/uk/OrcaSlicer_uk.po @@ -12215,10 +12215,10 @@ msgstr "Медові стільники" msgid "3D Honeycomb" msgstr "3D медові стільники" -msgid "2D Honeycomb" +msgid "Lateral Honeycomb" msgstr "" -msgid "2D Lattice" +msgid "Lateral Lattice" msgstr "2D Решітка" msgid "Cross Hatch" @@ -12233,21 +12233,21 @@ msgstr "" msgid "Gyroid" msgstr "Гіроїд" -msgid "Lattice angle 1" +msgid "Lateral lattice angle 1" msgstr "Кут решітки 1" msgid "" -"The angle of the first set of 2D lattice elements in the Z direction. Zero " +"The angle of the first set of Lateral lattice elements in the Z direction. Zero " "is vertical." msgstr "" "Кут першого набору 2D-решіткових елементів у напрямку Z. Нуль означає " "вертикальне розташування." -msgid "Lattice angle 2" +msgid "Lateral lattice angle 2" msgstr "Кут решітки 1" msgid "" -"The angle of the second set of 2D lattice elements in the Z direction. Zero " +"The angle of the second set of Lateral lattice elements in the Z direction. Zero " "is vertical." msgstr "" "Кут другого набору 2D-решіткових елементів у напрямку Z. Нуль означає " diff --git a/localization/i18n/zh_CN/OrcaSlicer_zh_CN.po b/localization/i18n/zh_CN/OrcaSlicer_zh_CN.po index a40aed688a..ddd8585b3e 100644 --- a/localization/i18n/zh_CN/OrcaSlicer_zh_CN.po +++ b/localization/i18n/zh_CN/OrcaSlicer_zh_CN.po @@ -11223,10 +11223,10 @@ msgstr "蜂窝" msgid "3D Honeycomb" msgstr "3D 蜂窝" -msgid "2D Honeycomb" +msgid "Lateral Honeycomb" msgstr "" -msgid "2D Lattice" +msgid "Lateral Lattice" msgstr "" msgid "Cross Hatch" @@ -11241,19 +11241,19 @@ msgstr "" msgid "Gyroid" msgstr "螺旋体" -msgid "Lattice angle 1" +msgid "Lateral lattice angle 1" msgstr "" msgid "" -"The angle of the first set of 2D lattice elements in the Z direction. Zero " +"The angle of the first set of Lateral lattice elements in the Z direction. Zero " "is vertical." msgstr "第一组二维晶格单元在Z方向的角度。零表示垂直。" -msgid "Lattice angle 2" +msgid "Lateral lattice angle 2" msgstr "" msgid "" -"The angle of the second set of 2D lattice elements in the Z direction. Zero " +"The angle of the second set of Lateral lattice elements in the Z direction. Zero " "is vertical." msgstr "第二组二维晶格单元在Z方向的角度。零表示垂直。" diff --git a/localization/i18n/zh_TW/OrcaSlicer_zh_TW.po b/localization/i18n/zh_TW/OrcaSlicer_zh_TW.po index 29c29173ed..094e7cc2ef 100644 --- a/localization/i18n/zh_TW/OrcaSlicer_zh_TW.po +++ b/localization/i18n/zh_TW/OrcaSlicer_zh_TW.po @@ -11412,10 +11412,10 @@ msgstr "蜂窩" msgid "3D Honeycomb" msgstr "3D 蜂窩" -msgid "2D Honeycomb" +msgid "Lateral Honeycomb" msgstr "" -msgid "2D Lattice" +msgid "Lateral Lattice" msgstr "2D 網格結構" msgid "Cross Hatch" @@ -11430,19 +11430,19 @@ msgstr "" msgid "Gyroid" msgstr "螺旋體" -msgid "Lattice angle 1" +msgid "Lateral lattice angle 1" msgstr "網格結構角度 1" msgid "" -"The angle of the first set of 2D lattice elements in the Z direction. Zero " +"The angle of the first set of Lateral lattice elements in the Z direction. Zero " "is vertical." msgstr "Z 軸方向第一組 2D 網格結構的角度，0° 表示垂直方向。" -msgid "Lattice angle 2" +msgid "Lateral lattice angle 2" msgstr "網格結構角度 2" msgid "" -"The angle of the second set of 2D lattice elements in the Z direction. Zero " +"The angle of the second set of Lateral lattice elements in the Z direction. Zero " "is vertical." msgstr "Z 軸方向第二組 2D 網格結構的角度，0° 表示垂直方向。" diff --git a/resources/images/param_2dhoneycomb.svg b/resources/images/param_lateral-honeycomb.svg similarity index 100% rename from resources/images/param_2dhoneycomb.svg rename to resources/images/param_lateral-honeycomb.svg diff --git a/resources/images/param_2dlattice.svg b/resources/images/param_lateral-lattice.svg similarity index 100% rename from resources/images/param_2dlattice.svg rename to resources/images/param_lateral-lattice.svg diff --git a/src/libslic3r/Fill/Fill.cpp b/src/libslic3r/Fill/Fill.cpp index 87370b8075..596a40c255 100644 --- a/src/libslic3r/Fill/Fill.cpp +++ b/src/libslic3r/Fill/Fill.cpp @@ -68,13 +68,13 @@ struct SurfaceFillParams float solid_infill_speed = 0; // Params for lattice infill angles - float lattice_angle_1 = 0.f; - float lattice_angle_2 = 0.f; + float lateral_lattice_angle_1 = 0.f; + float lateral_lattice_angle_2 = 0.f; float infill_lock_depth = 0; float skin_infill_depth = 0; bool symmetric_infill_y_axis = false; - // Params for 2D honeycomb + // Params for Lateral honeycomb float infill_overhang_angle = 60.f; bool operator<(const SurfaceFillParams &rhs) const { @@ -103,8 +103,8 @@ struct SurfaceFillParams RETURN_COMPARE_NON_EQUAL(sparse_infill_speed); RETURN_COMPARE_NON_EQUAL(top_surface_speed); RETURN_COMPARE_NON_EQUAL(solid_infill_speed); - RETURN_COMPARE_NON_EQUAL(lattice_angle_1); - RETURN_COMPARE_NON_EQUAL(lattice_angle_2); + RETURN_COMPARE_NON_EQUAL(lateral_lattice_angle_1); + RETURN_COMPARE_NON_EQUAL(lateral_lattice_angle_2); RETURN_COMPARE_NON_EQUAL(symmetric_infill_y_axis); RETURN_COMPARE_NON_EQUAL(infill_lock_depth); RETURN_COMPARE_NON_EQUAL(skin_infill_depth); RETURN_COMPARE_NON_EQUAL(infill_overhang_angle); @@ -130,8 +130,8 @@ struct SurfaceFillParams this->sparse_infill_speed == rhs.sparse_infill_speed && this->top_surface_speed == rhs.top_surface_speed && this->solid_infill_speed == rhs.solid_infill_speed && - this->lattice_angle_1 == rhs.lattice_angle_1 && - this->lattice_angle_2 == rhs.lattice_angle_2 && + this->lateral_lattice_angle_1 == rhs.lateral_lattice_angle_1 && + this->lateral_lattice_angle_2 == rhs.lateral_lattice_angle_2 && this->infill_lock_depth == rhs.infill_lock_depth && this->skin_infill_depth == rhs.skin_infill_depth && this->infill_overhang_angle == rhs.infill_overhang_angle; @@ -653,8 +653,8 @@ std::vector group_fills(const Layer &layer, LockRegionParam &lock_p params.pattern = region_config.sparse_infill_pattern.value; params.density = float(region_config.sparse_infill_density); params.multiline = int(region_config.fill_multiline); - params.lattice_angle_1 = region_config.lattice_angle_1; - params.lattice_angle_2 = region_config.lattice_angle_2; + params.lateral_lattice_angle_1 = region_config.lateral_lattice_angle_1; + params.lateral_lattice_angle_2 = region_config.lateral_lattice_angle_2; params.infill_overhang_angle = region_config.infill_overhang_angle; params.angle = 0.; if (params.pattern == ipLockedZag) { @@ -1041,8 +1041,8 @@ void Layer::make_fills(FillAdaptive::Octree* adaptive_fill_octree, FillAdaptive: params.resolution = resolution; params.use_arachne = surface_fill.params.pattern == ipConcentric || surface_fill.params.pattern == ipConcentricInternal; params.layer_height = layerm->layer()->height; - params.lattice_angle_1 = surface_fill.params.lattice_angle_1; - params.lattice_angle_2 = surface_fill.params.lattice_angle_2; + params.lateral_lattice_angle_1 = surface_fill.params.lateral_lattice_angle_1; + params.lateral_lattice_angle_2 = surface_fill.params.lateral_lattice_angle_2; params.infill_overhang_angle = surface_fill.params.infill_overhang_angle; // BBS @@ -1320,14 +1320,14 @@ Polylines Layer::generate_sparse_infill_polylines_for_anchoring(FillAdaptive::Oc case ipMonotonicLine: case ipAlignedRectilinear: case ipGrid: - case ip2DLattice: + case ipLateralLattice: case ipTriangles: case ipStars: case ipCubic: case ipLine: case ipConcentric: case ipHoneycomb: - case ip2DHoneycomb: + case ipLateralHoneycomb: case ip3DHoneycomb: case ipGyroid: case ipTpmsD: @@ -1381,8 +1381,8 @@ Polylines Layer::generate_sparse_infill_polylines_for_anchoring(FillAdaptive::Oc params.resolution = resolution; params.use_arachne = false; params.layer_height = layerm.layer()->height; - params.lattice_angle_1 = surface_fill.params.lattice_angle_1; - params.lattice_angle_2 = surface_fill.params.lattice_angle_2; + params.lateral_lattice_angle_1 = surface_fill.params.lateral_lattice_angle_1; + params.lateral_lattice_angle_2 = surface_fill.params.lateral_lattice_angle_2; params.infill_overhang_angle = surface_fill.params.infill_overhang_angle; params.multiline = surface_fill.params.multiline; diff --git a/src/libslic3r/Fill/FillBase.cpp b/src/libslic3r/Fill/FillBase.cpp index 7f6d2e7229..73f4655fe4 100644 --- a/src/libslic3r/Fill/FillBase.cpp +++ b/src/libslic3r/Fill/FillBase.cpp @@ -41,7 +41,7 @@ Fill* Fill::new_from_type(const InfillPattern type) switch (type) { case ipConcentric: return new FillConcentric(); case ipHoneycomb: return new FillHoneycomb(); - case ip2DHoneycomb: return new Fill2DHoneycomb(); + case ipLateralHoneycomb: return new FillLateralHoneycomb(); case ip3DHoneycomb: return new Fill3DHoneycomb(); case ipGyroid: return new FillGyroid(); case ipTpmsD: return new FillTpmsD();//from creality print @@ -52,7 +52,7 @@ Fill* Fill::new_from_type(const InfillPattern type) case ipMonotonic: return new FillMonotonic(); case ipLine: return new FillLine(); case ipGrid: return new FillGrid(); - case ip2DLattice: return new Fill2DLattice(); + case ipLateralLattice: return new FillLateralLattice(); case ipTriangles: return new FillTriangles(); case ipStars: return new FillStars(); case ipCubic: return new FillCubic(); diff --git a/src/libslic3r/Fill/FillBase.hpp b/src/libslic3r/Fill/FillBase.hpp index 89974c3fde..e26076bcf7 100644 --- a/src/libslic3r/Fill/FillBase.hpp +++ b/src/libslic3r/Fill/FillBase.hpp @@ -79,12 +79,12 @@ struct FillParams // Layer height for Concentric infill with Arachne. coordf_t layer_height { 0.f }; - // For 2D lattice - coordf_t lattice_angle_1 { 0.f }; - coordf_t lattice_angle_2 { 0.f }; + // For Lateral lattice + coordf_t lateral_lattice_angle_1 { 0.f }; + coordf_t lateral_lattice_angle_2 { 0.f }; InfillPattern pattern{ ipRectilinear }; - // For 2D Honeycomb + // For Lateral Honeycomb float infill_overhang_angle { 60 }; // BBS diff --git a/src/libslic3r/Fill/FillRectilinear.cpp b/src/libslic3r/Fill/FillRectilinear.cpp index 62cb005a68..3644860c1a 100644 --- a/src/libslic3r/Fill/FillRectilinear.cpp +++ b/src/libslic3r/Fill/FillRectilinear.cpp @@ -3025,7 +3025,7 @@ bool FillRectilinear::fill_surface_by_multilines(const Surface *surface, FillPar } } -if ((params.pattern == ip2DLattice || params.pattern == ip2DHoneycomb ) && params.multiline >1 ) +if ((params.pattern == ipLateralLattice || params.pattern == ipLateralHoneycomb ) && params.multiline >1 ) remove_overlapped(fill_lines, line_width); if (!fill_lines.empty()) { @@ -3090,16 +3090,16 @@ Polylines FillGrid::fill_surface(const Surface *surface, const FillParams ¶m return polylines_out; } -Polylines Fill2DLattice::fill_surface(const Surface *surface, const FillParams ¶ms) +Polylines FillLateralLattice::fill_surface(const Surface *surface, const FillParams ¶ms) { Polylines polylines_out; - coordf_t dx1 = tan(Geometry::deg2rad(params.lattice_angle_1)) * z; - coordf_t dx2 = tan(Geometry::deg2rad(params.lattice_angle_2)) * z; + coordf_t dx1 = tan(Geometry::deg2rad(params.lateral_lattice_angle_1)) * z; + coordf_t dx2 = tan(Geometry::deg2rad(params.lateral_lattice_angle_2)) * z; if (! this->fill_surface_by_multilines( surface, params, { { float(M_PI / 2.), float(dx1) }, { float(M_PI / 2.), float(dx2) } }, polylines_out)) - BOOST_LOG_TRIVIAL(error) << "Fill2DLattice::fill_surface() failed to fill a region."; + BOOST_LOG_TRIVIAL(error) << "FillLateralLattice::fill_surface() failed to fill a region."; if (this->layer_id % 2 == 1) for (int i = 0; i < polylines_out.size(); i++) @@ -3172,9 +3172,9 @@ Polylines FillQuarterCubic::fill_surface(const Surface* surface, const FillParam return polylines_out; } -Polylines Fill2DHoneycomb::fill_surface(const Surface *surface, const FillParams ¶ms) +Polylines FillLateralHoneycomb::fill_surface(const Surface *surface, const FillParams ¶ms) { - // the 2D honeycomb is generated based on a base pattern of an inverted Y with its junction at height zero + // the lateral honeycomb is generated based on a base pattern of an inverted Y with its junction at height zero // | // | // 0 --+-- @@ -3211,7 +3211,7 @@ Polylines Fill2DHoneycomb::fill_surface(const Surface *surface, const FillParams surface, multiline_params, { { half_pi, horizontal_offset } }, polylines_out)) - BOOST_LOG_TRIVIAL(error) << "Fill2DHoneycomb::fill_surface() failed to fill a region."; + BOOST_LOG_TRIVIAL(error) << "FillLateralHoneycomb::fill_surface() failed to fill a region."; } else { FillParams multiline_params = params; multiline_params.density *= 2 / (1*(2/3.) + 2*(1/3.)); @@ -3222,7 +3222,7 @@ Polylines Fill2DHoneycomb::fill_surface(const Surface *surface, const FillParams surface, multiline_params, { { half_pi, -horizontal_position + horizontal_offset }, { half_pi, horizontal_position + horizontal_offset } }, polylines_out)) - BOOST_LOG_TRIVIAL(error) << "Fill2DHoneycomb::fill_surface() failed to fill a region."; + BOOST_LOG_TRIVIAL(error) << "FillLateralHoneycomb::fill_surface() failed to fill a region."; } if (this->layer_id % 2 == 1) diff --git a/src/libslic3r/Fill/FillRectilinear.hpp b/src/libslic3r/Fill/FillRectilinear.hpp index 28b20ef1f2..3e4f3cf92f 100644 --- a/src/libslic3r/Fill/FillRectilinear.hpp +++ b/src/libslic3r/Fill/FillRectilinear.hpp @@ -76,11 +76,11 @@ protected: float _layer_angle(size_t idx) const override { return 0.f; } }; -class Fill2DLattice : public FillRectilinear +class FillLateralLattice : public FillRectilinear { public: - Fill* clone() const override { return new Fill2DLattice(*this); } - ~Fill2DLattice() override = default; + Fill* clone() const override { return new FillLateralLattice(*this); } + ~FillLateralLattice() override = default; Polylines fill_surface(const Surface *surface, const FillParams ¶ms) override; protected: @@ -140,11 +140,11 @@ protected: float _layer_angle(size_t idx) const override { return 0.f; } }; -class Fill2DHoneycomb : public FillAlignedRectilinear +class FillLateralHoneycomb : public FillAlignedRectilinear { public: - Fill* clone() const override { return new Fill2DHoneycomb(*this); } - ~Fill2DHoneycomb() override = default; + Fill* clone() const override { return new FillLateralHoneycomb(*this); } + ~FillLateralHoneycomb() override = default; Polylines fill_surface(const Surface *surface, const FillParams ¶ms) override; }; diff --git a/src/libslic3r/Layer.cpp b/src/libslic3r/Layer.cpp index 60cc113906..c5fe201d10 100644 --- a/src/libslic3r/Layer.cpp +++ b/src/libslic3r/Layer.cpp @@ -396,13 +396,13 @@ coordf_t Layer::get_sparse_infill_max_void_area() case ipAlignedRectilinear: case ipOctagramSpiral: case ipHilbertCurve: - case ip2DHoneycomb: + case ipLateralHoneycomb: case ip3DHoneycomb: case ipArchimedeanChords: max_void_area = std::max(max_void_area, spacing * spacing); break; case ipGrid: - case ip2DLattice: + case ipLateralLattice: case ipHoneycomb: case ipLightning: max_void_area = std::max(max_void_area, 4.0 * spacing * spacing); diff --git a/src/libslic3r/Preset.cpp b/src/libslic3r/Preset.cpp index 49f5ed10b2..6dc2544ddc 100644 --- a/src/libslic3r/Preset.cpp +++ b/src/libslic3r/Preset.cpp @@ -792,7 +792,7 @@ static std::vector s_Preset_print_options { "layer_height", "initial_layer_print_height", "wall_loops", "alternate_extra_wall", "slice_closing_radius", "spiral_mode", "spiral_mode_smooth", "spiral_mode_max_xy_smoothing", "spiral_starting_flow_ratio", "spiral_finishing_flow_ratio", "slicing_mode", "top_shell_layers", "top_shell_thickness", "top_surface_density", "bottom_surface_density", "bottom_shell_layers", "bottom_shell_thickness", "extra_perimeters_on_overhangs", "ensure_vertical_shell_thickness", "reduce_crossing_wall", "detect_thin_wall", "detect_overhang_wall", "overhang_reverse", "overhang_reverse_threshold","overhang_reverse_internal_only", "wall_direction", - "seam_position", "staggered_inner_seams", "wall_sequence", "is_infill_first", "sparse_infill_density","fill_multiline", "sparse_infill_pattern", "lattice_angle_1", "lattice_angle_2", "infill_overhang_angle", "top_surface_pattern", "bottom_surface_pattern", + "seam_position", "staggered_inner_seams", "wall_sequence", "is_infill_first", "sparse_infill_density","fill_multiline", "sparse_infill_pattern", "lateral_lattice_angle_1", "lateral_lattice_angle_2", "infill_overhang_angle", "top_surface_pattern", "bottom_surface_pattern", "infill_direction", "solid_infill_direction", "counterbore_hole_bridging","infill_shift_step", "sparse_infill_rotate_template", "solid_infill_rotate_template", "symmetric_infill_y_axis","skeleton_infill_density", "infill_lock_depth", "skin_infill_depth", "skin_infill_density", "align_infill_direction_to_model", "minimum_sparse_infill_area", "reduce_infill_retraction","internal_solid_infill_pattern","gap_fill_target", diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index 3db9b6cfbd..989fd6ffe1 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -161,8 +161,8 @@ static t_config_enum_values s_keys_map_InfillPattern { { "lightning", ipLightning }, { "honeycomb", ipHoneycomb }, { "3dhoneycomb", ip3DHoneycomb }, - { "2dhoneycomb", ip2DHoneycomb }, - { "2dlattice", ip2DLattice }, + { "lateral-honeycomb", ipLateralHoneycomb }, + { "lateral-lattice", ipLateralLattice }, { "crosshatch", ipCrossHatch }, { "tpmsd", ipTpmsD }, { "tpmsfk", ipTpmsFK }, @@ -2414,8 +2414,8 @@ void PrintConfigDef::init_fff_params() def->enum_values.push_back("lightning"); def->enum_values.push_back("honeycomb"); def->enum_values.push_back("3dhoneycomb"); - def->enum_values.push_back("2dhoneycomb"); - def->enum_values.push_back("2dlattice"); + def->enum_values.push_back("lateral-honeycomb"); + def->enum_values.push_back("lateral-lattice"); def->enum_values.push_back("crosshatch"); def->enum_values.push_back("tpmsd"); def->enum_values.push_back("tpmsfk"); @@ -2440,8 +2440,8 @@ void PrintConfigDef::init_fff_params() def->enum_labels.push_back(L("Lightning")); def->enum_labels.push_back(L("Honeycomb")); def->enum_labels.push_back(L("3D Honeycomb")); - def->enum_labels.push_back(L("2D Honeycomb")); - def->enum_labels.push_back(L("2D Lattice")); + def->enum_labels.push_back(L("Lateral Honeycomb")); + def->enum_labels.push_back(L("Lateral Lattice")); def->enum_labels.push_back(L("Cross Hatch")); def->enum_labels.push_back(L("TPMS-D")); def->enum_labels.push_back(L("TPMS-FK")); @@ -2452,20 +2452,20 @@ void PrintConfigDef::init_fff_params() def->enum_labels.push_back(L("Octagram Spiral")); def->set_default_value(new ConfigOptionEnum(ipCrossHatch)); - def = this->add("lattice_angle_1", coFloat); - def->label = L("Lattice angle 1"); + def = this->add("lateral_lattice_angle_1", coFloat); + def->label = L("Lateral lattice angle 1"); def->category = L("Strength"); - def->tooltip = L("The angle of the first set of 2D lattice elements in the Z direction. Zero is vertical."); + def->tooltip = L("The angle of the first set of Lateral lattice elements in the Z direction. Zero is vertical."); def->sidetext = "°"; // degrees, don't need translation def->min = -75; def->max = 75; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloat(-45)); - def = this->add("lattice_angle_2", coFloat); - def->label = L("Lattice angle 2"); + def = this->add("lateral_lattice_angle_2", coFloat); + def->label = L("Lateral lattice angle 2"); def->category = L("Strength"); - def->tooltip = L("The angle of the second set of 2D lattice elements in the Z direction. Zero is vertical."); + def->tooltip = L("The angle of the second set of Lateral lattice elements in the Z direction. Zero is vertical."); def->sidetext = "°"; // degrees, don't need translation def->min = -75; def->max = 75; diff --git a/src/libslic3r/PrintConfig.hpp b/src/libslic3r/PrintConfig.hpp index c2ec764ec3..d9fbd57944 100644 --- a/src/libslic3r/PrintConfig.hpp +++ b/src/libslic3r/PrintConfig.hpp @@ -70,7 +70,7 @@ enum InfillPattern : int { ipLine, ipGrid, ipTriangles, ipStars, ipCubic, ipAdaptiveCubic, ipQuarterCubic, ipSupportCubic, ipLightning, - ipHoneycomb, ip3DHoneycomb, ip2DHoneycomb, ip2DLattice, + ipHoneycomb, ip3DHoneycomb, ipLateralHoneycomb, ipLateralLattice, ipCrossHatch, ipTpmsD, ipTpmsFK, ipGyroid, ipConcentric, ipHilbertCurve, ipArchimedeanChords, ipOctagramSpiral, ipSupportBase, ipConcentricInternal, @@ -981,8 +981,8 @@ PRINT_CONFIG_CLASS_DEFINE( ((ConfigOptionString, sparse_infill_rotate_template)) ((ConfigOptionPercent, sparse_infill_density)) ((ConfigOptionEnum, sparse_infill_pattern)) - ((ConfigOptionFloat, lattice_angle_1)) - ((ConfigOptionFloat, lattice_angle_2)) + ((ConfigOptionFloat, lateral_lattice_angle_1)) + ((ConfigOptionFloat, lateral_lattice_angle_2)) ((ConfigOptionFloat, infill_overhang_angle)) ((ConfigOptionBool, align_infill_direction_to_model)) ((ConfigOptionEnum, fuzzy_skin)) diff --git a/src/libslic3r/PrintObject.cpp b/src/libslic3r/PrintObject.cpp index fbc56dceed..bf56528e98 100644 --- a/src/libslic3r/PrintObject.cpp +++ b/src/libslic3r/PrintObject.cpp @@ -1098,8 +1098,8 @@ bool PrintObject::invalidate_state_by_config_options( || opt_key == "bottom_surface_density" || opt_key == "initial_layer_line_width" || opt_key == "small_area_infill_flow_compensation" - || opt_key == "lattice_angle_1" - || opt_key == "lattice_angle_2" + || opt_key == "lateral_lattice_angle_1" + || opt_key == "lateral_lattice_angle_2" || opt_key == "infill_overhang_angle") { steps.emplace_back(posInfill); } else if (opt_key == "sparse_infill_pattern" @@ -3785,10 +3785,10 @@ void PrintObject::combine_infill() ((infill_pattern == ipRectilinear || infill_pattern == ipMonotonic || infill_pattern == ipGrid || - infill_pattern == ip2DLattice || + infill_pattern == ipLateralLattice || infill_pattern == ipLine || infill_pattern == ipHoneycomb || - infill_pattern == ip2DHoneycomb) ? 1.5f : 0.5f) * + infill_pattern == ipLateralHoneycomb) ? 1.5f : 0.5f) * layerms.back()->flow(frSolidInfill).scaled_width(); for (ExPolygon &expoly : intersection) polygons_append(intersection_with_clearance, offset(expoly, clearance_offset)); diff --git a/src/slic3r/GUI/ConfigManipulation.cpp b/src/slic3r/GUI/ConfigManipulation.cpp index 78d5027744..3cd70d5d8a 100644 --- a/src/slic3r/GUI/ConfigManipulation.cpp +++ b/src/slic3r/GUI/ConfigManipulation.cpp @@ -566,7 +566,7 @@ void ConfigManipulation::toggle_print_fff_options(DynamicPrintConfig *config, co // Infill patterns that support multiline infill. InfillPattern pattern = config->opt_enum("sparse_infill_pattern"); - bool have_multiline_infill_pattern = pattern == ipGyroid || pattern == ipGrid || pattern == ipRectilinear || pattern == ipTpmsD || pattern == ipTpmsFK || pattern == ipCrossHatch || pattern == ipHoneycomb || pattern == ip2DLattice || pattern == ip2DHoneycomb || + bool have_multiline_infill_pattern = pattern == ipGyroid || pattern == ipGrid || pattern == ipRectilinear || pattern == ipTpmsD || pattern == ipTpmsFK || pattern == ipCrossHatch || pattern == ipHoneycomb || pattern == ipLateralLattice || pattern == ipLateralHoneycomb || pattern == ipCubic || pattern == ipStars || pattern == ipAlignedRectilinear || pattern == ipLightning || pattern == ip3DHoneycomb || pattern == ipAdaptiveCubic || pattern == ipSupportCubic; toggle_line("fill_multiline", have_multiline_infill_pattern); @@ -875,8 +875,8 @@ void ConfigManipulation::toggle_print_fff_options(DynamicPrintConfig *config, co toggle_line("interlocking_depth", use_beam_interlocking); toggle_line("interlocking_boundary_avoidance", use_beam_interlocking); - bool lattice_options = config->opt_enum("sparse_infill_pattern") == InfillPattern::ip2DLattice; - for (auto el : { "lattice_angle_1", "lattice_angle_2"}) + bool lattice_options = config->opt_enum("sparse_infill_pattern") == InfillPattern::ipLateralLattice; + for (auto el : { "lateral_lattice_angle_1", "lateral_lattice_angle_2"}) toggle_line(el, lattice_options); //Orca: hide rotate template for solid infill if not support @@ -895,7 +895,7 @@ void ConfigManipulation::toggle_print_fff_options(DynamicPrintConfig *config, co toggle_line("solid_infill_rotate_template", show_solid_infill_rotate_template); - toggle_line("infill_overhang_angle", config->opt_enum("sparse_infill_pattern") == InfillPattern::ip2DHoneycomb); + toggle_line("infill_overhang_angle", config->opt_enum("sparse_infill_pattern") == InfillPattern::ipLateralHoneycomb); } void ConfigManipulation::update_print_sla_config(DynamicPrintConfig* config, const bool is_global_config/* = false*/) diff --git a/src/slic3r/GUI/GUI_Factories.cpp b/src/slic3r/GUI/GUI_Factories.cpp index 5acd8cadbc..1e3f5b9693 100644 --- a/src/slic3r/GUI/GUI_Factories.cpp +++ b/src/slic3r/GUI/GUI_Factories.cpp @@ -106,7 +106,7 @@ std::map> SettingsFactory::PART_CAT }}, { L("Strength"), {{"wall_loops", "",1},{"top_shell_layers", L("Top Solid Layers"),1},{"top_shell_thickness", L("Top Minimum Shell Thickness"),1},{"top_surface_density", L("Top Surface Density"),1}, {"bottom_shell_layers", L("Bottom Solid Layers"),1}, {"bottom_shell_thickness", L("Bottom Minimum Shell Thickness"),1},{"bottom_surface_density", L("Bottom Surface Density"),1}, - {"sparse_infill_density", "",1},{"sparse_infill_pattern", "",1},{"lattice_angle_1", "",1},{"lattice_angle_2", "",1},{"infill_overhang_angle", "",1},{"infill_anchor", "",1},{"infill_anchor_max", "",1},{"top_surface_pattern", "",1},{"bottom_surface_pattern", "",1}, {"internal_solid_infill_pattern", "",1}, + {"sparse_infill_density", "",1},{"sparse_infill_pattern", "",1},{"lateral_lattice_angle_1", "",1},{"lateral_lattice_angle_2", "",1},{"infill_overhang_angle", "",1},{"infill_anchor", "",1},{"infill_anchor_max", "",1},{"top_surface_pattern", "",1},{"bottom_surface_pattern", "",1}, {"internal_solid_infill_pattern", "",1}, {"align_infill_direction_to_model", "", 1}, {"infill_combination", "",1}, {"infill_combination_max_layer_height", "",1}, {"infill_wall_overlap", "",1},{"top_bottom_infill_wall_overlap", "",1}, {"solid_infill_direction", "",1}, {"infill_direction", "",1}, {"bridge_angle", "",1}, {"internal_bridge_angle", "",1}, {"minimum_sparse_infill_area", "",1} }}, diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp index 700a61c90c..a4fbacc205 100644 --- a/src/slic3r/GUI/Tab.cpp +++ b/src/slic3r/GUI/Tab.cpp @@ -2221,8 +2221,8 @@ void TabPrint::build() optgroup->append_single_option_line("symmetric_infill_y_axis", "strength_settings_infill#zig-zag"); optgroup->append_single_option_line("infill_shift_step", "strength_settings_infill#cross-hatch"); - optgroup->append_single_option_line("lattice_angle_1", "strength_settings_infill#2d-lattice"); - optgroup->append_single_option_line("lattice_angle_2", "strength_settings_infill#2d-lattice"); + optgroup->append_single_option_line("lateral_lattice_angle_1", "strength_settings_infill#2d-lattice"); + optgroup->append_single_option_line("lateral_lattice_angle_2", "strength_settings_infill#2d-lattice"); optgroup->append_single_option_line("infill_overhang_angle", "strength_settings_infill#2d-honeycomb"); optgroup->append_single_option_line("infill_anchor_max", "strength_settings_infill#anchor"); optgroup->append_single_option_line("infill_anchor", "strength_settings_infill#anchor");