mirror of
https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git
synced 2025-08-14 18:55:59 +08:00
Merge branch 'master' into SPE-1597-per-glyph-transformation-over-surface
This commit is contained in:
Filip Sykala - NTB T15p
commit
666a40519c
Binary file not shown.
@ -2014,7 +2014,7 @@ msgstr ""
|
||||
msgid "Status:"
|
||||
msgstr "Tila:"
|
||||
|
||||
#: ../src/common/prntbase.cpp:272
|
||||
#: src/slic3r/GUI/FirmwareDialog.cpp:831
|
||||
msgid "Ready"
|
||||
msgstr "Valmis"
|
||||
|
||||
@ -2022,11 +2022,11 @@ msgstr "Valmis"
|
||||
msgid "Advanced: Output log"
|
||||
msgstr ""
|
||||
|
||||
#: ../src/generic/dbgrptg.cpp:97 ../src/generic/progdlgg.cpp:759
|
||||
#: ../src/richtext/richtextstyledlg.cpp:277
|
||||
#: ../src/richtext/richtextsymboldlg.cpp:476 ../src/common/stockitem.cpp:148
|
||||
#: ../src/msw/progdlg.cpp:170 ../src/msw/progdlg.cpp:679
|
||||
#: ../src/html/helpdlg.cpp:90
|
||||
#: src/slic3r/GUI/FirmwareDialog.cpp:862
|
||||
#: src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp:356
|
||||
#: src/slic3r/GUI/Mouse3DController.cpp:543
|
||||
#: src/slic3r/GUI/PrintHostDialogs.cpp:313
|
||||
#: src/slic3r/GUI/SendSystemInfoDialog.cpp:125
|
||||
msgid "Close"
|
||||
msgstr "Sulje"
|
||||
|
||||
@ -2052,8 +2052,7 @@ msgstr "Muotogalleria"
|
||||
msgid "Select shape from the gallery"
|
||||
msgstr "Valitse muoto galleriasta"
|
||||
|
||||
#. TRANSLATORS: Name of keyboard key
|
||||
#: ../src/common/stockitem.cpp:140 ../src/common/accelcmn.cpp:81
|
||||
#: src/slic3r/GUI/GalleryDialog.cpp:114 src/slic3r/GUI/Tab.cpp:4564
|
||||
msgid "Add"
|
||||
msgstr "Lisää"
|
||||
|
||||
@ -2061,9 +2060,9 @@ msgstr "Lisää"
|
||||
msgid "Add one or more custom shapes"
|
||||
msgstr ""
|
||||
|
||||
#. TRANSLATORS: Name of keyboard key
|
||||
#: ../src/richtext/richtextbuffer.cpp:8221 ../src/common/stockitem.cpp:152
|
||||
#: ../src/common/accelcmn.cpp:50 ../src/stc/stc_i18n.cpp:20
|
||||
#: src/slic3r/GUI/GalleryDialog.cpp:115 src/slic3r/GUI/GalleryDialog.cpp:528
|
||||
#: src/slic3r/GUI/GLCanvas3D.cpp:5307 src/slic3r/GUI/GUI_Factories.cpp:460
|
||||
#: src/slic3r/GUI/Tab.cpp:4160
|
||||
msgid "Delete"
|
||||
msgstr "Poista"
|
||||
|
||||
@ -2075,9 +2074,9 @@ msgstr ""
|
||||
msgid "Add to bed"
|
||||
msgstr ""
|
||||
|
||||
#: ../include/wx/msgdlg.h:278 ../src/richtext/richtextstyledlg.cpp:297
|
||||
#: ../src/common/stockitem.cpp:178 ../src/msw/msgdlg.cpp:454
|
||||
#: ../src/msw/msgdlg.cpp:747 ../src/gtk1/fontdlg.cpp:138
|
||||
#: src/slic3r/GUI/GalleryDialog.cpp:142
|
||||
#: src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp:2178
|
||||
#: src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp:2265
|
||||
msgid "OK"
|
||||
msgstr "OK"
|
||||
|
||||
@ -2546,8 +2545,8 @@ msgid_plural "Redo %1$d Actions"
|
||||
msgstr[0] ""
|
||||
msgstr[1] ""
|
||||
|
||||
#: ../src/generic/srchctlg.cpp:56 ../src/html/helpwnd.cpp:535
|
||||
#: ../src/html/helpwnd.cpp:550
|
||||
#: src/slic3r/GUI/GLCanvas3D.cpp:4756 src/slic3r/GUI/GLCanvas3D.cpp:5431
|
||||
#: src/slic3r/GUI/KBShortcutsDialog.cpp:115 src/slic3r/GUI/Search.cpp:482
|
||||
msgid "Search"
|
||||
msgstr "Etsi"
|
||||
|
||||
@ -2577,7 +2576,7 @@ msgstr ""
|
||||
msgid "Enable rotations (slow)"
|
||||
msgstr ""
|
||||
|
||||
#: ../src/richtext/richtextsizepage.cpp:266
|
||||
#: src/slic3r/GUI/GLCanvas3D.cpp:4870
|
||||
msgid "Alignment"
|
||||
msgstr "Tasaus"
|
||||
|
||||
@ -2765,8 +2764,7 @@ msgstr ""
|
||||
msgid "Type"
|
||||
msgstr "Tyyppi"
|
||||
|
||||
#. TRANSLATORS: Label of font style
|
||||
#: ../src/richtext/richtextformatdlg.cpp:339 ../src/propgrid/advprops.cpp:680
|
||||
#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:221 src/libslic3r/PrintConfig.cpp:2836
|
||||
msgid "Style"
|
||||
msgstr "Tyyli"
|
||||
|
||||
@ -2866,7 +2864,7 @@ msgstr ""
|
||||
msgid "Select all connectors"
|
||||
msgstr ""
|
||||
|
||||
#: ../src/common/stockitem.cpp:151 ../src/stc/stc_i18n.cpp:17
|
||||
#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:852 src/libslic3r/PrintConfig.cpp:4739
|
||||
msgid "Cut"
|
||||
msgstr "Leikkaa"
|
||||
|
||||
@ -3007,8 +3005,7 @@ msgstr ""
|
||||
msgid "Text-Rotate"
|
||||
msgstr ""
|
||||
|
||||
#: ../src/richtext/richtextformatdlg.cpp:344 ../src/osx/carbon/fontdlg.cpp:287
|
||||
#: ../src/common/stockitem.cpp:194
|
||||
#: src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp:873
|
||||
msgid "Font"
|
||||
msgstr "Kirjasin"
|
||||
|
||||
@ -3144,7 +3141,9 @@ msgstr "Ladataan"
|
||||
msgid "Queue"
|
||||
msgstr "Jono"
|
||||
|
||||
#: ../src/common/stockitem.cpp:141
|
||||
#: src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp:1881
|
||||
#: src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp:676
|
||||
#: src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp:365
|
||||
msgid "Apply"
|
||||
msgstr "Käytä"
|
||||
|
||||
@ -3872,7 +3871,8 @@ msgstr ""
|
||||
msgid "Length"
|
||||
msgstr ""
|
||||
|
||||
#: ../src/motif/filedlg.cpp:220
|
||||
#: src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp:2005
|
||||
#: src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp:2007
|
||||
msgid "Selection"
|
||||
msgstr "Valinta"
|
||||
|
||||
@ -4061,13 +4061,9 @@ msgstr ""
|
||||
msgid "Simplification is currently only allowed when a single part is selected"
|
||||
msgstr ""
|
||||
|
||||
#: ../src/generic/filedlgg.cpp:357 ../src/generic/dirctrlg.cpp:570
|
||||
#: ../src/generic/dirctrlg.cpp:588 ../src/generic/dirctrlg.cpp:599
|
||||
#: ../src/generic/dirdlgg.cpp:323 ../src/generic/filectrlg.cpp:642
|
||||
#: ../src/generic/filectrlg.cpp:756 ../src/generic/filectrlg.cpp:770
|
||||
#: ../src/generic/filectrlg.cpp:786 ../src/generic/filectrlg.cpp:1368
|
||||
#: ../src/generic/filectrlg.cpp:1399 ../src/gtk/filedlg.cpp:74
|
||||
#: ../src/gtk1/fontdlg.cpp:74
|
||||
#: src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp:191
|
||||
#: src/slic3r/GUI/MainFrame.cpp:1246 src/slic3r/GUI/MainFrame.cpp:1717
|
||||
#: src/slic3r/GUI/PrintHostDialogs.cpp:425
|
||||
msgid "Error"
|
||||
msgstr "Virhe"
|
||||
|
||||
@ -4644,7 +4640,7 @@ msgstr ""
|
||||
msgid "Check for new version of application"
|
||||
msgstr ""
|
||||
|
||||
#: ../src/common/stockitem.cpp:181
|
||||
#: src/slic3r/GUI/GUI_App.cpp:2406
|
||||
msgid "&Preferences"
|
||||
msgstr "&Asetukset"
|
||||
|
||||
@ -5280,7 +5276,8 @@ msgstr ""
|
||||
msgid "Add layer range"
|
||||
msgstr ""
|
||||
|
||||
#: ../src/generic/filectrlg.cpp:424
|
||||
#: src/slic3r/GUI/GUI_ObjectList.cpp:334
|
||||
#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:142
|
||||
msgid "Name"
|
||||
msgstr "Nimi"
|
||||
|
||||
@ -5674,7 +5671,8 @@ msgstr ""
|
||||
msgid "of a current Object"
|
||||
msgstr ""
|
||||
|
||||
#: ../src/common/stockitem.cpp:167
|
||||
#: src/slic3r/GUI/GUI_ObjectList.cpp:4167
|
||||
#: src/slic3r/GUI/GUI_ObjectList.cpp:4242 src/slic3r/GUI/Plater.cpp:199
|
||||
msgid "Info"
|
||||
msgstr "Tiedot"
|
||||
|
||||
@ -5928,7 +5926,7 @@ msgstr ""
|
||||
msgid "Open Documentation in web browser."
|
||||
msgstr ""
|
||||
|
||||
#: ../src/common/stockitem.cpp:154
|
||||
#: src/slic3r/GUI/ImGuiWrapper.cpp:680
|
||||
msgid "Edit"
|
||||
msgstr "Muokkaa"
|
||||
|
||||
@ -6718,7 +6716,7 @@ msgstr ""
|
||||
msgid "&About %s"
|
||||
msgstr ""
|
||||
|
||||
#: ../src/common/stockitem.cpp:257
|
||||
#: src/slic3r/GUI/MainFrame.cpp:1172 src/slic3r/GUI/MainFrame.cpp:1175
|
||||
msgid "Show about dialog"
|
||||
msgstr "Näytä tietoja-valintaikkuna"
|
||||
|
||||
@ -6753,7 +6751,8 @@ msgstr ""
|
||||
msgid "Top View"
|
||||
msgstr ""
|
||||
|
||||
#: ../src/richtext/richtextsizepage.cpp:288 ../src/common/stockitem.cpp:144
|
||||
#. TRN Main menu: View->Bottom
|
||||
#: src/slic3r/GUI/MainFrame.cpp:1205
|
||||
msgid "Bottom"
|
||||
msgstr "Alaosa"
|
||||
|
||||
@ -6777,16 +6776,7 @@ msgstr ""
|
||||
msgid "Rear View"
|
||||
msgstr ""
|
||||
|
||||
#. TRANSLATORS: Keystroke for manipulating a tree control
|
||||
#. TRANSLATORS: Name of keyboard key
|
||||
#: ../src/generic/datavgen.cpp:6146
|
||||
#: ../src/richtext/richtextliststylepage.cpp:249
|
||||
#: ../src/richtext/richtextliststylepage.cpp:252
|
||||
#: ../src/richtext/richtextliststylepage.cpp:253
|
||||
#: ../src/richtext/richtextbulletspage.cpp:186
|
||||
#: ../src/richtext/richtextbulletspage.cpp:189
|
||||
#: ../src/richtext/richtextbulletspage.cpp:190
|
||||
#: ../src/richtext/richtextsizepage.cpp:249 ../src/common/accelcmn.cpp:61
|
||||
#: src/slic3r/GUI/MainFrame.cpp:1211
|
||||
msgid "Left"
|
||||
msgstr "Vasen"
|
||||
|
||||
@ -6794,12 +6784,7 @@ msgstr "Vasen"
|
||||
msgid "Left View"
|
||||
msgstr ""
|
||||
|
||||
#. TRANSLATORS: Keystroke for manipulating a tree control
|
||||
#. TRANSLATORS: Name of keyboard key
|
||||
#: ../src/generic/datavgen.cpp:6149
|
||||
#: ../src/richtext/richtextliststylepage.cpp:251
|
||||
#: ../src/richtext/richtextbulletspage.cpp:188
|
||||
#: ../src/richtext/richtextsizepage.cpp:250 ../src/common/accelcmn.cpp:62
|
||||
#: src/slic3r/GUI/MainFrame.cpp:1213
|
||||
msgid "Right"
|
||||
msgstr "Oikealle"
|
||||
|
||||
@ -7047,7 +7032,7 @@ msgstr ""
|
||||
msgid "Exit %s"
|
||||
msgstr ""
|
||||
|
||||
#: ../src/common/stockitem.cpp:156
|
||||
#: src/slic3r/GUI/MainFrame.cpp:1394 src/slic3r/GUI/MainFrame.cpp:1632
|
||||
msgid "&Quit"
|
||||
msgstr "&Poistu"
|
||||
|
||||
@ -7088,20 +7073,15 @@ msgstr ""
|
||||
msgid "Deletes all objects"
|
||||
msgstr ""
|
||||
|
||||
#: ../src/richtext/richtextctrl.cpp:329 ../src/osx/textctrl_osx.cpp:573
|
||||
#: ../src/common/stockitem.cpp:203 ../src/common/cmdproc.cpp:271
|
||||
#: ../src/msw/textctrl.cpp:2504
|
||||
#: src/slic3r/GUI/MainFrame.cpp:1425
|
||||
msgid "&Undo"
|
||||
msgstr "&Kumoa"
|
||||
|
||||
#: ../src/richtext/richtextctrl.cpp:330 ../src/osx/textctrl_osx.cpp:574
|
||||
#: ../src/common/stockitem.cpp:185 ../src/common/cmdproc.cpp:293
|
||||
#: ../src/common/cmdproc.cpp:300 ../src/msw/textctrl.cpp:2505
|
||||
#: src/slic3r/GUI/MainFrame.cpp:1428
|
||||
msgid "&Redo"
|
||||
msgstr "&Toista"
|
||||
|
||||
#: ../src/richtext/richtextctrl.cpp:333 ../src/osx/textctrl_osx.cpp:577
|
||||
#: ../src/common/stockitem.cpp:150 ../src/msw/textctrl.cpp:2508
|
||||
#: src/slic3r/GUI/MainFrame.cpp:1433
|
||||
msgid "&Copy"
|
||||
msgstr "K&opioi"
|
||||
|
||||
@ -7109,8 +7089,7 @@ msgstr "K&opioi"
|
||||
msgid "Copy selection to clipboard"
|
||||
msgstr ""
|
||||
|
||||
#: ../src/richtext/richtextctrl.cpp:334 ../src/osx/textctrl_osx.cpp:578
|
||||
#: ../src/common/stockitem.cpp:180 ../src/msw/textctrl.cpp:2509
|
||||
#: src/slic3r/GUI/MainFrame.cpp:1436
|
||||
msgid "&Paste"
|
||||
msgstr "L&iitä"
|
||||
|
||||
@ -7236,18 +7215,15 @@ msgstr ""
|
||||
msgid "Fullscreen"
|
||||
msgstr ""
|
||||
|
||||
#: ../src/common/stockitem.cpp:157
|
||||
#: src/slic3r/GUI/MainFrame.cpp:1544 src/slic3r/GUI/MainFrame.cpp:1651
|
||||
msgid "&File"
|
||||
msgstr "&Tiedosto"
|
||||
|
||||
#: ../src/common/stockitem.cpp:154
|
||||
#: src/slic3r/GUI/MainFrame.cpp:1545
|
||||
msgid "&Edit"
|
||||
msgstr "&Muokkaa"
|
||||
|
||||
#: ../src/aui/tabmdi.cpp:311 ../src/aui/tabmdi.cpp:327
|
||||
#: ../src/aui/tabmdi.cpp:329 ../src/generic/mdig.cpp:294
|
||||
#: ../src/generic/mdig.cpp:310 ../src/generic/mdig.cpp:314
|
||||
#: ../src/msw/mdi.cpp:78
|
||||
#: src/slic3r/GUI/MainFrame.cpp:1546
|
||||
msgid "&Window"
|
||||
msgstr "&Ikkuna"
|
||||
|
||||
@ -7255,9 +7231,7 @@ msgstr "&Ikkuna"
|
||||
msgid "&View"
|
||||
msgstr ""
|
||||
|
||||
#: ../src/generic/wizard.cpp:441 ../src/richtext/richtextstyledlg.cpp:303
|
||||
#: ../src/richtext/richtextsymboldlg.cpp:479 ../src/osx/menu_osx.cpp:734
|
||||
#: ../src/common/stockitem.cpp:163
|
||||
#: src/slic3r/GUI/MainFrame.cpp:1550 src/slic3r/GUI/MainFrame.cpp:1655
|
||||
msgid "&Help"
|
||||
msgstr "&Ohje"
|
||||
|
||||
@ -7988,7 +7962,8 @@ msgstr ""
|
||||
msgid "Do you want to save the changes to \"%1%\"?"
|
||||
msgstr ""
|
||||
|
||||
#: ../src/common/stockitem.cpp:190 ../src/common/sizer.cpp:2797
|
||||
#: src/slic3r/GUI/Plater.cpp:1729 src/slic3r/GUI/UnsavedChangesDialog.cpp:907
|
||||
#: src/slic3r/GUI/UnsavedChangesDialog.cpp:1604
|
||||
msgid "Save"
|
||||
msgstr "Tallenna"
|
||||
|
||||
@ -9495,7 +9470,8 @@ msgstr ""
|
||||
msgid "Stealth"
|
||||
msgstr ""
|
||||
|
||||
#: ../src/generic/fontdlgg.cpp:328 ../src/generic/fontdlgg.cpp:331
|
||||
#: src/slic3r/GUI/Search.cpp:97 src/slic3r/GUI/Search.cpp:391
|
||||
#: src/slic3r/GUI/Tab.cpp:2816
|
||||
msgid "Normal"
|
||||
msgstr "Tavallinen"
|
||||
|
||||
@ -10298,7 +10274,7 @@ msgstr ""
|
||||
msgid "Set"
|
||||
msgstr ""
|
||||
|
||||
#: ../src/common/stockitem.cpp:158 ../src/html/helpwnd.cpp:490
|
||||
#: src/slic3r/GUI/Tab.cpp:4367
|
||||
msgid "Find"
|
||||
msgstr "Etsi"
|
||||
|
||||
@ -10314,7 +10290,7 @@ msgstr ""
|
||||
msgid "Case insensitive"
|
||||
msgstr ""
|
||||
|
||||
#: ../src/generic/fdrepdlg.cpp:144
|
||||
#: src/slic3r/GUI/Tab.cpp:4465
|
||||
msgid "Whole word"
|
||||
msgstr "Vain kokonaiset sanat"
|
||||
|
||||
@ -10704,7 +10680,7 @@ msgstr ""
|
||||
msgid "Undef group"
|
||||
msgstr ""
|
||||
|
||||
#: ../src/generic/filectrlg.cpp:427
|
||||
#: src/slic3r/GUI/UnsavedChangesDialog.cpp:2022
|
||||
msgid "Modified"
|
||||
msgstr "Muokattu"
|
||||
|
||||
@ -14498,8 +14474,7 @@ msgid ""
|
||||
"close all holes in the model."
|
||||
msgstr ""
|
||||
|
||||
#: ../src/richtext/richtextfontpage.cpp:350
|
||||
#: ../src/richtext/richtextfontpage.cpp:354
|
||||
#: src/libslic3r/PrintConfig.cpp:2595
|
||||
msgid "Regular"
|
||||
msgstr "Tavallinen"
|
||||
|
||||
@ -15506,11 +15481,11 @@ msgid ""
|
||||
"images will be rotated by 90 degrees."
|
||||
msgstr ""
|
||||
|
||||
#: ../src/generic/prntdlgg.cpp:613 ../src/generic/prntdlgg.cpp:868
|
||||
#: src/libslic3r/PrintConfig.cpp:3633
|
||||
msgid "Landscape"
|
||||
msgstr "Vaakasuunta"
|
||||
|
||||
#: ../src/generic/prntdlgg.cpp:612 ../src/generic/prntdlgg.cpp:867
|
||||
#: src/libslic3r/PrintConfig.cpp:3634
|
||||
msgid "Portrait"
|
||||
msgstr "Pystysuunta"
|
||||
|
||||
@ -16007,10 +15982,7 @@ msgid ""
|
||||
"value."
|
||||
msgstr ""
|
||||
|
||||
#. TRANSLATORS: Name of keyboard key
|
||||
#: ../include/wx/msgdlg.h:280 ../src/osx/button_osx.cpp:39
|
||||
#: ../src/common/stockitem.cpp:163 ../src/common/accelcmn.cpp:80
|
||||
#: ../src/html/helpdlg.cpp:66 ../src/html/helpfrm.cpp:111
|
||||
#: src/libslic3r/PrintConfig.cpp:4702
|
||||
msgid "Help"
|
||||
msgstr "Ohje"
|
||||
|
||||
|
||||
Binary file not shown.
@ -184,6 +184,16 @@ msgstr ""
|
||||
"%1%=%2% mm est trop bas pour être imprimable avec une hauteur de couche de "
|
||||
"%3% mm"
|
||||
|
||||
#: src/slic3r/GUI/DoubleSlider.cpp:711 src/libslic3r/Utils.cpp:1015
|
||||
#, boost-format
|
||||
msgid "%1%d"
|
||||
msgstr "%1%j"
|
||||
|
||||
#: src/slic3r/GUI/DoubleSlider.cpp:712 src/libslic3r/Utils.cpp:1016
|
||||
#, boost-format
|
||||
msgid "%1%h"
|
||||
msgstr "%1%h"
|
||||
|
||||
#: src/slic3r/GUI/Tab.cpp:5227
|
||||
#, boost-format
|
||||
msgid ""
|
||||
@ -197,6 +207,12 @@ msgstr ""
|
||||
msgid "1 (light)"
|
||||
msgstr "1 (léger)"
|
||||
|
||||
#. TRN "m" means "minutes"
|
||||
#: src/slic3r/GUI/DoubleSlider.cpp:713 src/libslic3r/Utils.cpp:1018
|
||||
#, boost-format
|
||||
msgid "%1%m"
|
||||
msgstr "%1%m"
|
||||
|
||||
#. TRN ConfigWizard: Materials : "%1%" = "Filaments"/"SLA materials"
|
||||
#: src/slic3r/GUI/ConfigWizard.cpp:838
|
||||
#, boost-format
|
||||
@ -234,6 +250,11 @@ msgstr "%1% Préréglage"
|
||||
msgid "%1% : read only"
|
||||
msgstr "%1% : lecture seule"
|
||||
|
||||
#: src/slic3r/GUI/DoubleSlider.cpp:714 src/libslic3r/Utils.cpp:1026
|
||||
#, boost-format
|
||||
msgid "%1%s"
|
||||
msgstr "%1%s"
|
||||
|
||||
#. TRN ConfigWizard: Materials : "%1%" = "Filaments"/"SLA materials"
|
||||
#: src/slic3r/GUI/ConfigWizard.cpp:835
|
||||
#, boost-format
|
||||
@ -1736,6 +1757,10 @@ msgstr ""
|
||||
"diamètre seront imprimées avec des doubles parois pour plus de stabilité. "
|
||||
"Réglez cette valeur à zéro pour aucune double paroi."
|
||||
|
||||
#: src/slic3r/GUI/Tab.cpp:5157
|
||||
msgid "Branching"
|
||||
msgstr "Branchement"
|
||||
|
||||
#. TRN One of the "Support tree type"s on SLAPrintSettings : Supports
|
||||
#: src/libslic3r/PrintConfig.cpp:3929
|
||||
msgid "Branching (experimental)"
|
||||
@ -1754,6 +1779,10 @@ msgstr "Pont"
|
||||
msgid "Bridge flow ratio"
|
||||
msgstr "Ratio de flux pour les ponts"
|
||||
|
||||
#: src/libslic3r/ExtrusionRole.cpp:45 src/libslic3r/ExtrusionRole.cpp:73
|
||||
msgid "Bridge infill"
|
||||
msgstr "Remplissage du pont"
|
||||
|
||||
#: src/libslic3r/PrintConfig.cpp:522
|
||||
msgid "Bridges"
|
||||
msgstr "Ponts"
|
||||
@ -3122,6 +3151,12 @@ msgstr ""
|
||||
"L'initialisation de CURL a échoué. PrusaSlicer ne pourra pas établir de "
|
||||
"connexions réseau. Voir les journaux pour plus de détails."
|
||||
|
||||
#. TRN Means "current color"
|
||||
#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:340
|
||||
#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:356
|
||||
msgid "Current"
|
||||
msgstr "Courant"
|
||||
|
||||
#: src/slic3r/GUI/wxExtensions.cpp:629
|
||||
#, c-format, boost-format
|
||||
msgid "Current mode is %s"
|
||||
@ -5058,6 +5093,10 @@ msgstr "Exposition"
|
||||
msgid "Exposure time"
|
||||
msgstr "Temps d'exposition"
|
||||
|
||||
#: src/libslic3r/ExtrusionRole.cpp:39 src/libslic3r/ExtrusionRole.cpp:61
|
||||
msgid "External perimeter"
|
||||
msgstr "Périmètre externe"
|
||||
|
||||
#: src/slic3r/GUI/PresetHints.cpp:170
|
||||
msgid "external perimeters"
|
||||
msgstr "périmètres externes"
|
||||
@ -7459,6 +7498,10 @@ msgstr "erreur interne"
|
||||
msgid "Internal error: %1%"
|
||||
msgstr "Erreur interne : %1%"
|
||||
|
||||
#: src/libslic3r/ExtrusionRole.cpp:41 src/libslic3r/ExtrusionRole.cpp:65
|
||||
msgid "Internal infill"
|
||||
msgstr "Remplissage interne"
|
||||
|
||||
#: src/libslic3r/GCode.cpp:825
|
||||
msgid "In the custom G-code were found reserved keywords:"
|
||||
msgstr "Dans le G-code personnalisé ont été trouvés des mots-clés réservés :"
|
||||
@ -8626,6 +8669,11 @@ msgid "Message for pause print on current layer (%1% mm)."
|
||||
msgstr ""
|
||||
"Message pour mettre en pause l'impression sur la couche en cours (%1% mm)."
|
||||
|
||||
#: src/slic3r/GUI/GCodeViewer.cpp:3278
|
||||
msgctxt "Metre"
|
||||
msgid "m"
|
||||
msgstr "m"
|
||||
|
||||
#: src/libslic3r/PrintConfig.cpp:1897 src/libslic3r/PrintConfig.cpp:1906
|
||||
msgid "Min"
|
||||
msgstr "Minimum"
|
||||
@ -10175,6 +10223,12 @@ msgstr "Orienter le texte vers la caméra."
|
||||
msgid "Origin"
|
||||
msgstr "Origine"
|
||||
|
||||
#. TRN Means "original color"
|
||||
#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:342
|
||||
#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:356
|
||||
msgid "Original"
|
||||
msgstr "Original"
|
||||
|
||||
#: src/slic3r/GUI/UnsavedChangesDialog.cpp:860
|
||||
msgid "Original value"
|
||||
msgstr "Valeur d'origine"
|
||||
@ -10235,6 +10289,10 @@ msgstr "Parois extérieures"
|
||||
msgid "Overflow"
|
||||
msgstr "Débordement"
|
||||
|
||||
#: src/libslic3r/ExtrusionRole.cpp:40 src/libslic3r/ExtrusionRole.cpp:63
|
||||
msgid "Overhang perimeter"
|
||||
msgstr "Périmètre en surplomb"
|
||||
|
||||
#. TRN FilamentSettings : "Dynamic fan speeds"
|
||||
#: src/libslic3r/PrintConfig.cpp:587
|
||||
msgid ""
|
||||
@ -10662,6 +10720,10 @@ msgstr ""
|
||||
"L'intégration du téléchargeur au bureau a échoué - Impossible de trouver "
|
||||
"l'exécutable."
|
||||
|
||||
#: src/libslic3r/ExtrusionRole.cpp:38 src/libslic3r/ExtrusionRole.cpp:59
|
||||
msgid "Perimeter"
|
||||
msgstr "Périmètre"
|
||||
|
||||
#: src/libslic3r/PrintConfig.cpp:3312
|
||||
msgid "Perimeter distribution count"
|
||||
msgstr "Nombre de distributions des périmètres"
|
||||
@ -13870,6 +13932,10 @@ msgstr "Jupe"
|
||||
msgid "Skirt and brim"
|
||||
msgstr "Jupe et bordure"
|
||||
|
||||
#: src/libslic3r/ExtrusionRole.cpp:47 src/libslic3r/ExtrusionRole.cpp:77
|
||||
msgid "Skirt/Brim"
|
||||
msgstr "Jupe/Bordure"
|
||||
|
||||
#: src/libslic3r/PrintConfig.cpp:2350
|
||||
msgid "Skirt height"
|
||||
msgstr "Hauteur de la jupe"
|
||||
|
||||
Binary file not shown.
@ -4295,7 +4295,7 @@ msgstr "Pontok minimális távolsága"
|
||||
#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:43
|
||||
#: src/libslic3r/PrintConfig.cpp:3945
|
||||
msgid "Support points density"
|
||||
msgstr "Támadztó pontok sűrűsége"
|
||||
msgstr "Támasztó pontok sűrűsége"
|
||||
|
||||
#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:44
|
||||
#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1279
|
||||
|
||||
Binary file not shown.
@ -183,6 +183,16 @@ msgid "%1%=%2% mm is too low to be printable at a layer height %3% mm"
|
||||
msgstr ""
|
||||
"%1%=%2% mm è troppo basso per essere un altezza layer stampabile %3% mm"
|
||||
|
||||
#: src/slic3r/GUI/DoubleSlider.cpp:711 src/libslic3r/Utils.cpp:1015
|
||||
#, boost-format
|
||||
msgid "%1%d"
|
||||
msgstr "%1%g"
|
||||
|
||||
#: src/slic3r/GUI/DoubleSlider.cpp:712 src/libslic3r/Utils.cpp:1016
|
||||
#, boost-format
|
||||
msgid "%1%h"
|
||||
msgstr "%1%h"
|
||||
|
||||
#: src/slic3r/GUI/Tab.cpp:5227
|
||||
#, boost-format
|
||||
msgid ""
|
||||
@ -196,6 +206,12 @@ msgstr ""
|
||||
msgid "1 (light)"
|
||||
msgstr "1 (leggero)"
|
||||
|
||||
#. TRN "m" means "minutes"
|
||||
#: src/slic3r/GUI/DoubleSlider.cpp:713 src/libslic3r/Utils.cpp:1018
|
||||
#, boost-format
|
||||
msgid "%1%m"
|
||||
msgstr "%1%m"
|
||||
|
||||
#. TRN ConfigWizard: Materials : "%1%" = "Filaments"/"SLA materials"
|
||||
#: src/slic3r/GUI/ConfigWizard.cpp:838
|
||||
#, boost-format
|
||||
@ -233,6 +249,11 @@ msgstr "%1% Preset"
|
||||
msgid "%1% : read only"
|
||||
msgstr "%1% : sola lettura"
|
||||
|
||||
#: src/slic3r/GUI/DoubleSlider.cpp:714 src/libslic3r/Utils.cpp:1026
|
||||
#, boost-format
|
||||
msgid "%1%s"
|
||||
msgstr "%1%s"
|
||||
|
||||
#. TRN ConfigWizard: Materials : "%1%" = "Filaments"/"SLA materials"
|
||||
#: src/slic3r/GUI/ConfigWizard.cpp:835
|
||||
#, boost-format
|
||||
@ -1716,6 +1737,10 @@ msgstr ""
|
||||
"diametro verranno stampate con pareti doppie per garantire la stabilità. "
|
||||
"Imposta questo valore a zero per non avere pareti doppie."
|
||||
|
||||
#: src/slic3r/GUI/Tab.cpp:5157
|
||||
msgid "Branching"
|
||||
msgstr "Ramificazione"
|
||||
|
||||
#. TRN One of the "Support tree type"s on SLAPrintSettings : Supports
|
||||
#: src/libslic3r/PrintConfig.cpp:3929
|
||||
msgid "Branching (experimental)"
|
||||
@ -1734,6 +1759,10 @@ msgstr "Bridge"
|
||||
msgid "Bridge flow ratio"
|
||||
msgstr "Rapporto flusso Bridge"
|
||||
|
||||
#: src/libslic3r/ExtrusionRole.cpp:45 src/libslic3r/ExtrusionRole.cpp:73
|
||||
msgid "Bridge infill"
|
||||
msgstr "Riempimento Bridge"
|
||||
|
||||
#: src/libslic3r/PrintConfig.cpp:522
|
||||
msgid "Bridges"
|
||||
msgstr "Bridge"
|
||||
@ -3094,6 +3123,12 @@ msgstr ""
|
||||
"CURL init non riuscito. PrusaSlicer non sarà in grado di stabilire "
|
||||
"connessioni di rete. Vedere i log per ulteriori dettagli."
|
||||
|
||||
#. TRN Means "current color"
|
||||
#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:340
|
||||
#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:356
|
||||
msgid "Current"
|
||||
msgstr "Attuale"
|
||||
|
||||
#: src/slic3r/GUI/wxExtensions.cpp:629
|
||||
#, c-format, boost-format
|
||||
msgid "Current mode is %s"
|
||||
@ -5012,6 +5047,10 @@ msgstr "Esposizione"
|
||||
msgid "Exposure time"
|
||||
msgstr "Tempo di esposizione"
|
||||
|
||||
#: src/libslic3r/ExtrusionRole.cpp:39 src/libslic3r/ExtrusionRole.cpp:61
|
||||
msgid "External perimeter"
|
||||
msgstr "Perimetro esterno"
|
||||
|
||||
#: src/slic3r/GUI/PresetHints.cpp:170
|
||||
msgid "external perimeters"
|
||||
msgstr "perimetri esterni"
|
||||
@ -7382,6 +7421,10 @@ msgstr "errore interno"
|
||||
msgid "Internal error: %1%"
|
||||
msgstr "Errore interno: %1%"
|
||||
|
||||
#: src/libslic3r/ExtrusionRole.cpp:41 src/libslic3r/ExtrusionRole.cpp:65
|
||||
msgid "Internal infill"
|
||||
msgstr "Riempimento interno"
|
||||
|
||||
#: src/libslic3r/GCode.cpp:825
|
||||
msgid "In the custom G-code were found reserved keywords:"
|
||||
msgstr "Nel G-code personalizzato sono state trovate parole chiave riservate:"
|
||||
@ -8538,6 +8581,11 @@ msgstr "Messaggio"
|
||||
msgid "Message for pause print on current layer (%1% mm)."
|
||||
msgstr "Messaggio per pausa stampa al corrente layer (%1% mm)."
|
||||
|
||||
#: src/slic3r/GUI/GCodeViewer.cpp:3278
|
||||
msgctxt "Metre"
|
||||
msgid "m"
|
||||
msgstr "m"
|
||||
|
||||
#: src/libslic3r/PrintConfig.cpp:1897 src/libslic3r/PrintConfig.cpp:1906
|
||||
msgid "Min"
|
||||
msgstr "Minimo"
|
||||
@ -10079,6 +10127,12 @@ msgstr "Orienta il testo verso di te."
|
||||
msgid "Origin"
|
||||
msgstr "Origine"
|
||||
|
||||
#. TRN Means "original color"
|
||||
#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:342
|
||||
#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:356
|
||||
msgid "Original"
|
||||
msgstr "Originale"
|
||||
|
||||
#: src/slic3r/GUI/UnsavedChangesDialog.cpp:860
|
||||
msgid "Original value"
|
||||
msgstr "Valore originale"
|
||||
@ -10139,6 +10193,10 @@ msgstr "Pareti esterne"
|
||||
msgid "Overflow"
|
||||
msgstr "Overflow"
|
||||
|
||||
#: src/libslic3r/ExtrusionRole.cpp:40 src/libslic3r/ExtrusionRole.cpp:63
|
||||
msgid "Overhang perimeter"
|
||||
msgstr "Perimetro sporgente"
|
||||
|
||||
#. TRN FilamentSettings : "Dynamic fan speeds"
|
||||
#: src/libslic3r/PrintConfig.cpp:587
|
||||
msgid ""
|
||||
@ -10570,6 +10628,10 @@ msgstr ""
|
||||
"Esecuzione dell'integrazione del downloader desktop non riuscita - "
|
||||
"Impossibile trovare l'eseguibile."
|
||||
|
||||
#: src/libslic3r/ExtrusionRole.cpp:38 src/libslic3r/ExtrusionRole.cpp:59
|
||||
msgid "Perimeter"
|
||||
msgstr "Perimetro"
|
||||
|
||||
#: src/libslic3r/PrintConfig.cpp:3312
|
||||
msgid "Perimeter distribution count"
|
||||
msgstr "Conteggio della distribuzione dei perimetri"
|
||||
@ -13754,6 +13816,10 @@ msgstr "Skirt"
|
||||
msgid "Skirt and brim"
|
||||
msgstr "Skirt e brim"
|
||||
|
||||
#: src/libslic3r/ExtrusionRole.cpp:47 src/libslic3r/ExtrusionRole.cpp:77
|
||||
msgid "Skirt/Brim"
|
||||
msgstr "Skirt/Brim"
|
||||
|
||||
#: src/libslic3r/PrintConfig.cpp:2350
|
||||
msgid "Skirt height"
|
||||
msgstr "Altezza skirt"
|
||||
|
||||
Binary file not shown.
@ -3073,6 +3073,12 @@ msgstr ""
|
||||
"CURLの初期化に失敗しました。 PrusaSlicerはネットワーク接続を確立できなくなり"
|
||||
"ます。 詳細については、ログを参照してください。"
|
||||
|
||||
#. TRN Means "current color"
|
||||
#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:340
|
||||
#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:356
|
||||
msgid "Current"
|
||||
msgstr "現在"
|
||||
|
||||
#: src/slic3r/GUI/wxExtensions.cpp:629
|
||||
#, c-format, boost-format
|
||||
msgid "Current mode is %s"
|
||||
@ -9948,6 +9954,12 @@ msgstr "テキストの向きをカメラ側にする。"
|
||||
msgid "Origin"
|
||||
msgstr "原点"
|
||||
|
||||
#. TRN Means "original color"
|
||||
#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:342
|
||||
#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:356
|
||||
msgid "Original"
|
||||
msgstr "オリジナル"
|
||||
|
||||
#: src/slic3r/GUI/UnsavedChangesDialog.cpp:860
|
||||
msgid "Original value"
|
||||
msgstr "オリジナルの値"
|
||||
@ -10677,7 +10689,7 @@ msgstr ""
|
||||
"後処理スクリプトは、Gコードファイルを%2%変更する予定ですが、Gコードファイルが"
|
||||
"削除され、新しい名前で保存されている可能性があります。\n"
|
||||
"後処理スクリプトを調整してGコードを変更し、オプションで後処理されたGコード"
|
||||
"ファイルの名前を変更する方法についてマニュアルを参照してください。"
|
||||
"ファイルの名前を変更する方法についてマニュアルを参照してください。\n"
|
||||
|
||||
#: src/slic3r/GUI/Tab.cpp:1683 src/libslic3r/PrintConfig.cpp:2080
|
||||
msgid "Post-processing scripts"
|
||||
|
||||
Binary file not shown.
@ -3141,6 +3141,12 @@ msgstr ""
|
||||
"Niepowodzenie inicjalizacji CURL. PrusaSlicer nie będzie w stanie nawiązać "
|
||||
"połączenia przez sieć. Szczegóły w logach."
|
||||
|
||||
#. TRN Means "current color"
|
||||
#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:340
|
||||
#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:356
|
||||
msgid "Current"
|
||||
msgstr "Obecny"
|
||||
|
||||
#: src/slic3r/GUI/wxExtensions.cpp:629
|
||||
#, c-format, boost-format
|
||||
msgid "Current mode is %s"
|
||||
@ -10119,6 +10125,12 @@ msgstr "Skieruj tekst w stronę kamery."
|
||||
msgid "Origin"
|
||||
msgstr "Punkt zerowy"
|
||||
|
||||
#. TRN Means "original color"
|
||||
#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:342
|
||||
#: src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp:356
|
||||
msgid "Original"
|
||||
msgstr "Oryginalny"
|
||||
|
||||
#: src/slic3r/GUI/UnsavedChangesDialog.cpp:860
|
||||
msgid "Original value"
|
||||
msgstr "Oryginalna wartość"
|
||||
|
||||
Binary file not shown.
File diff suppressed because it is too large
Load Diff
@ -5126,13 +5126,13 @@ bool ImGui::ColorPicker4(const char* label, float col[4], ImGuiColorEditFlags fl
|
||||
PushItemFlag(ImGuiItemFlags_NoNavDefaultFocus, true);
|
||||
ImVec4 col_v4(col[0], col[1], col[2], (flags & ImGuiColorEditFlags_NoAlpha) ? 1.0f : col[3]);
|
||||
if ((flags & ImGuiColorEditFlags_NoLabel))
|
||||
Text(current_label ? current_label : "Current");
|
||||
Text("%s", current_label ? current_label : "Current");
|
||||
|
||||
ImGuiColorEditFlags sub_flags_to_forward = ImGuiColorEditFlags__InputMask | ImGuiColorEditFlags_HDR | ImGuiColorEditFlags_AlphaPreview | ImGuiColorEditFlags_AlphaPreviewHalf | ImGuiColorEditFlags_NoTooltip;
|
||||
ColorButton("##current", col_v4, (flags & sub_flags_to_forward), ImVec2(square_sz * 3, square_sz * 2));
|
||||
if (ref_col != NULL)
|
||||
{
|
||||
Text(original_label ? original_label : "Original");
|
||||
Text("%s", original_label ? original_label : "Original");
|
||||
ImVec4 ref_col_v4(ref_col[0], ref_col[1], ref_col[2], (flags & ImGuiColorEditFlags_NoAlpha) ? 1.0f : ref_col[3]);
|
||||
if (ColorButton("##original", ref_col_v4, (flags & sub_flags_to_forward), ImVec2(square_sz * 3, square_sz * 2)))
|
||||
{
|
||||
|
||||
@ -750,7 +750,7 @@ void arrange(ArrangePolygons &items,
|
||||
d += corr;
|
||||
|
||||
for (auto &itm : items)
|
||||
if (itm.bed_idx == bedidx)
|
||||
if (itm.bed_idx == int(bedidx))
|
||||
itm.translation += d;
|
||||
}
|
||||
}
|
||||
|
||||
@ -901,6 +901,7 @@ namespace DoExport {
|
||||
silent_time_estimator_enabled = (config.gcode_flavor == gcfMarlinLegacy || config.gcode_flavor == gcfMarlinFirmware)
|
||||
&& config.silent_mode;
|
||||
processor.reset();
|
||||
processor.initialize_result_moves();
|
||||
processor.apply_config(config);
|
||||
processor.enable_stealth_time_estimator(silent_time_estimator_enabled);
|
||||
}
|
||||
@ -2450,7 +2451,7 @@ void GCode::process_layer_single_object(
|
||||
int extruder_override_id = is_anything_overridden ? layer_tools.wiping_extrusions().get_extruder_override(eec, instance_id) : -1;
|
||||
return print_wipe_extrusions ?
|
||||
extruder_override_id == int(extruder_id) :
|
||||
extruder_override_id < 0 && extruder_id == correct_extruder_id;
|
||||
extruder_override_id < 0 && int(extruder_id) == correct_extruder_id;
|
||||
};
|
||||
|
||||
ExtrusionEntitiesPtr temp_fill_extrusions;
|
||||
|
||||
@ -1071,8 +1071,7 @@ void GCodeProcessor::process_file(const std::string& filename, std::function<voi
|
||||
// process gcode
|
||||
m_result.filename = filename;
|
||||
m_result.id = ++s_result_id;
|
||||
// 1st move must be a dummy move
|
||||
m_result.moves.emplace_back(GCodeProcessorResult::MoveVertex());
|
||||
initialize_result_moves();
|
||||
size_t parse_line_callback_cntr = 10000;
|
||||
m_parser.parse_file(filename, [this, cancel_callback, &parse_line_callback_cntr](GCodeReader& reader, const GCodeReader::GCodeLine& line) {
|
||||
if (-- parse_line_callback_cntr == 0) {
|
||||
@ -1099,8 +1098,6 @@ void GCodeProcessor::initialize(const std::string& filename)
|
||||
// process gcode
|
||||
m_result.filename = filename;
|
||||
m_result.id = ++s_result_id;
|
||||
// 1st move must be a dummy move
|
||||
m_result.moves.emplace_back(GCodeProcessorResult::MoveVertex());
|
||||
}
|
||||
|
||||
void GCodeProcessor::process_buffer(const std::string &buffer)
|
||||
|
||||
@ -639,6 +639,11 @@ namespace Slic3r {
|
||||
|
||||
// Streaming interface, for processing G-codes just generated by PrusaSlicer in a pipelined fashion.
|
||||
void initialize(const std::string& filename);
|
||||
void initialize_result_moves() {
|
||||
// 1st move must be a dummy move
|
||||
assert(m_result.moves.empty());
|
||||
m_result.moves.emplace_back(GCodeProcessorResult::MoveVertex());
|
||||
}
|
||||
void process_buffer(const std::string& buffer);
|
||||
void finalize(bool post_process);
|
||||
|
||||
|
||||
@ -581,7 +581,7 @@ void WipeTower::set_extruder(size_t idx, const PrintConfig& config)
|
||||
m_filpar.push_back(FilamentParameters());
|
||||
|
||||
m_filpar[idx].material = config.filament_type.get_at(idx);
|
||||
m_filpar[idx].is_soluble = config.wipe_tower_extruder == 0 ? config.filament_soluble.get_at(idx) : (idx != config.wipe_tower_extruder - 1);
|
||||
m_filpar[idx].is_soluble = config.wipe_tower_extruder == 0 ? config.filament_soluble.get_at(idx) : (idx != size_t(config.wipe_tower_extruder - 1));
|
||||
m_filpar[idx].temperature = config.temperature.get_at(idx);
|
||||
m_filpar[idx].first_layer_temperature = config.first_layer_temperature.get_at(idx);
|
||||
|
||||
@ -1292,7 +1292,6 @@ WipeTower::ToolChangeResult WipeTower::finish_layer()
|
||||
|
||||
// brim (first layer only)
|
||||
if (first_layer) {
|
||||
box_coordinates box = wt_box;
|
||||
size_t loops_num = (m_wipe_tower_brim_width + spacing/2.f) / spacing;
|
||||
|
||||
for (size_t i = 0; i < loops_num; ++ i) {
|
||||
|
||||
@ -903,7 +903,7 @@ Polygon its_convex_hull_2d_above(const indexed_triangle_set& its, const Transfor
|
||||
chs.push_back(collect_mesh_projection_points_above(range));
|
||||
});
|
||||
|
||||
const Polygons polygons(chs.begin(), chs.end());
|
||||
const Polygons polygons(std::make_move_iterator(chs.begin()), std::make_move_iterator(chs.end()));
|
||||
return Geometry::convex_hull(polygons);
|
||||
}
|
||||
|
||||
|
||||
@ -2150,6 +2150,7 @@ void GCodeViewer::load_toolpaths(const GCodeProcessorResult& gcode_result)
|
||||
|
||||
// layers zs / roles / extruder ids -> extract from result
|
||||
size_t last_travel_s_id = 0;
|
||||
size_t first_travel_s_id = 0;
|
||||
seams_count = 0;
|
||||
for (size_t i = 0; i < m_moves_count; ++i) {
|
||||
const GCodeProcessorResult::MoveVertex& move = gcode_result.moves[i];
|
||||
@ -2163,8 +2164,10 @@ void GCodeViewer::load_toolpaths(const GCodeProcessorResult& gcode_result)
|
||||
// layers zs
|
||||
const double* const last_z = m_layers.empty() ? nullptr : &m_layers.get_zs().back();
|
||||
const double z = static_cast<double>(move.position.z());
|
||||
if (last_z == nullptr || z < *last_z - EPSILON || *last_z + EPSILON < z)
|
||||
m_layers.append(z, { last_travel_s_id, move_id });
|
||||
if (last_z == nullptr || z < *last_z - EPSILON || *last_z + EPSILON < z) {
|
||||
const size_t start_it = (m_layers.empty() && first_travel_s_id != 0) ? first_travel_s_id : last_travel_s_id;
|
||||
m_layers.append(z, { start_it, move_id });
|
||||
}
|
||||
else
|
||||
m_layers.get_ranges().back().last = move_id;
|
||||
}
|
||||
@ -2177,7 +2180,8 @@ void GCodeViewer::load_toolpaths(const GCodeProcessorResult& gcode_result)
|
||||
else if (move.type == EMoveType::Travel) {
|
||||
if (move_id - last_travel_s_id > 1 && !m_layers.empty())
|
||||
m_layers.get_ranges().back().last = move_id;
|
||||
|
||||
else if (m_layers.empty() && first_travel_s_id == 0)
|
||||
first_travel_s_id = move_id;
|
||||
last_travel_s_id = move_id;
|
||||
}
|
||||
}
|
||||
@ -2433,8 +2437,10 @@ void GCodeViewer::refresh_render_paths(bool keep_sequential_current_first, bool
|
||||
for (size_t i = 0; i < buffer.paths.size(); ++i) {
|
||||
const Path& path = buffer.paths[i];
|
||||
if (path.type == EMoveType::Travel) {
|
||||
if (!is_travel_in_layers_range(i, m_layers_z_range[0], m_layers_z_range[1]))
|
||||
continue;
|
||||
if (path.sub_paths.front().first.s_id > m_layers_z_range[0]) {
|
||||
if (!is_travel_in_layers_range(i, m_layers_z_range[0], m_layers_z_range[1]))
|
||||
continue;
|
||||
}
|
||||
}
|
||||
else if (!is_in_layers_range(path, m_layers_z_range[0], m_layers_z_range[1]))
|
||||
continue;
|
||||
|
||||
@ -391,7 +391,7 @@ void ObjectClipper::render_cut(const std::vector<size_t>* ignore_idxs) const
|
||||
// Now update the ignore idxs. Find the first element belonging to the next clipper,
|
||||
// and remove everything before it and decrement everything by current number of contours.
|
||||
const int num_of_contours = clipper.first->get_number_of_contours();
|
||||
ignore_idxs_local.erase(ignore_idxs_local.begin(), std::find_if(ignore_idxs_local.begin(), ignore_idxs_local.end(), [num_of_contours](size_t idx) { return idx >= num_of_contours; } ));
|
||||
ignore_idxs_local.erase(ignore_idxs_local.begin(), std::find_if(ignore_idxs_local.begin(), ignore_idxs_local.end(), [num_of_contours](size_t idx) { return idx >= size_t(num_of_contours); } ));
|
||||
for (size_t& idx : ignore_idxs_local)
|
||||
idx -= num_of_contours;
|
||||
}
|
||||
|
||||
@ -5301,8 +5301,9 @@ void Plater::import_zip_archive()
|
||||
if (input_file.empty())
|
||||
return;
|
||||
|
||||
fs::path path = into_path(input_file);
|
||||
preview_zip_archive(path);
|
||||
wxArrayString arr;
|
||||
arr.Add(input_file);
|
||||
load_files(arr, false);
|
||||
}
|
||||
|
||||
void Plater::import_sl1_archive()
|
||||
@ -6098,7 +6099,7 @@ void Plater::increase_instances(size_t num, int obj_idx, int inst_idx)
|
||||
if (const auto obj_idxs = get_selection().get_object_idxs(); !obj_idxs.empty()) {
|
||||
// we need a copy made here because the selection changes at every call of increase_instances()
|
||||
const Selection::ObjectIdxsToInstanceIdxsMap content = p->get_selection().get_content();
|
||||
for (const size_t& obj_id : obj_idxs) {
|
||||
for (const unsigned int obj_id : obj_idxs) {
|
||||
if (auto obj_it = content.find(int(obj_id)); obj_it != content.end())
|
||||
increase_instances(1, int(obj_id), *obj_it->second.rbegin());
|
||||
}
|
||||
@ -6638,11 +6639,14 @@ bool Plater::export_3mf(const boost::filesystem::path& output_path)
|
||||
if (ret) {
|
||||
// Success
|
||||
// p->statusbar()->set_status_text(format_wxstr(_L("3MF file exported to %s"), path));
|
||||
BOOST_LOG_TRIVIAL(info) << "3MF file exported to " << path;
|
||||
p->set_project_filename(path);
|
||||
}
|
||||
else {
|
||||
// Failure
|
||||
// p->statusbar()->set_status_text(format_wxstr(_L("Error exporting 3MF file %s"), path));
|
||||
const wxString what = GUI::format_wxstr(_L("%1%: %2%"),_L("Unable to save file") , path_u8);
|
||||
show_error(this, what);
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user