336 Commits

Author SHA1 Message Date
Filip Sykala - NTB T15p
fc11639679 change char[] to std::string as svg file data storage 2023-09-06 13:46:49 +02:00
Filip Sykala - NTB T15p
41f1c2caa5 Fix:
../src/libslic3r/Format/3mf.cpp:953:21: error: ‘const string’ {aka ‘const class std::basic_string<char>’} has no member named ‘_Starts_with’
2023-09-05 14:52:33 +02:00
Filip Sykala - NTB T15p
ca71305c75 Merge branch 'master' into fs_svg
# Conflicts:
#	src/slic3r/Utils/EmbossStylesSerializable.cpp
#	src/slic3r/Utils/EmbossStylesSerializable.hpp
2023-09-04 13:33:22 +02:00
ps_copyright
f32859c302 final copyright headers 2023-09-01 14:49:07 +02:00
Filip Sykala - NTB T15p
480c571499 Store shape as svg into 3mf
Without obfuscation of svg.
2023-08-02 22:34:33 +02:00
Filip Sykala - NTB T15p
d530831e35 Add icons(refresh and burn) to svg emboss
Add NSVG image to shape
2023-07-19 12:02:28 +02:00
Filip Sykala - NTB T15p
36bb7cfe9b Merge branch 'fs_dir_per_glyph_SPE-1597' into fs_svg 2023-06-13 14:34:33 +02:00
Filip Sykala - NTB T15p
2605b2d9d6 Merge branch 'master' into fs_dir_per_glyph_SPE-1597 2023-06-13 14:34:11 +02:00
tamasmeszaros
283fd6feb4 Fix sla archive filenames with using the archive format registry 2023-06-09 10:59:41 +02:00
Filip Sykala - NTB T15p
b71cb25163 Run able fix after merge(still issue with scale for per glyph transformation) 2023-06-07 11:19:28 +02:00
Filip Sykala - NTB T15p
e831255018 Merge branch 'fs_dir_per_glyph_SPE-1597' into fs_svg
# Conflicts:
#	src/libslic3r/Emboss.cpp
#	src/libslic3r/Format/3mf.cpp
#	src/libslic3r/TextConfiguration.hpp
#	src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoEmboss.hpp
#	src/slic3r/GUI/Jobs/EmbossJob.cpp
#	src/slic3r/GUI/Jobs/EmbossJob.hpp
2023-06-07 11:18:26 +02:00
Filip Sykala - NTB T15p
5de06a9ef8 Merge branch 'master' into fs_svg 2023-06-02 10:53:47 +02:00
Filip Sykala - NTB T15p
733b70b26f Separate horizontal and vertical align
Vertically align on base line of text to be able set base line of per glyph independent on align
2023-05-26 16:50:27 +02:00
Filip Sykala - NTB T15p
35044e29c3 Create text volume with feature per letter transformation. 2023-05-23 10:30:14 +02:00
Pavel
72f8590332 Add missing include 2023-05-12 10:32:14 +02:00
tamasmeszaros
8f680fd496 Fix no action on sla archive import with "profile only" option 2023-05-10 17:05:05 +02:00
tamasmeszaros
d4ad9deb94 Archive format registration refactored
Fix tests
2023-05-10 14:08:11 +02:00
YuSanka
83a2dc3b5a Follow up 9e56625287 - Added code to avoid a crash and allow to load 3mf even if cut information was corrupted 2023-04-19 12:06:35 +02:00
YuSanka
9e56625287 Fix for #10319 - MacOS 2.6 Alpha6 Crash on project load
This issue was not related to the OS and was caused by bug inside export function.
Wrong object id was saved for the cut objects
2023-04-19 10:01:31 +02:00
Filip Sykala - NTB T15p
bc51ad7525 Merge branch 'master' into fs_svg 2023-04-06 08:25:36 +02:00
Filip Sykala - NTB T15p
382a0fe1e3 Merge branch 'master' into fs_svg
# Conflicts:
#	src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoEmboss.hpp
#	src/slic3r/GUI/Jobs/EmbossJob.cpp
#	src/slic3r/GUI/Jobs/EmbossJob.hpp
#	src/slic3r/GUI/SurfaceDrag.cpp
2023-04-06 08:25:20 +02:00
Mimoja
e93b222d33 format/AnycubicSLA: refactor Anycubic SLA format and add Photon Mono and Mono SE printers (#9929)
* format/sla: Rename pwmx format to AnycubicSLA

The Anycubic Photon SLA printer familiy is shipped with the PhotonWorkshop slicer.
This slicer generates the sliced archives. These archives have per-printer
extensions, not only pwmx. The name is -most of the times- comprised of the
PhontonWorkshop "pw" bit and the model name. "mo" for the Photon Mono, "mx"
for the Mono X.

Therefore the format name "pwmx" is incorrect and we are renaming it to AnycubicSLA.
On top of it we are introducing a helper macro to connect file extension and printer
definition as most printers use extremely similiar formats.

Signed-off-by: Mimoja <git@mimoja.de>

* format/AnycubicSLA: Add missing fields

The AnycubicSLA format description is derived from reverse engineering of
the PhotonWorkshop output files.

While the initial Photon devices had their binary headers with version 1
we have seen newer models with additional versions. Namely 515, 516 and 517.
We are adding the version handling to the AnycubicSLA exporter to prepare
for future version handling.
Some fields were missing for Version 1 which are added.

Signed-off-by: Mimoja <git@mimoja.de>

* PrintConfig/sla: Move material notes to simple view

As the Anycubic Photon Mono X uses the material notes to configure the
printers parameters we need to change the visibility to allow every user acces.

This will change the default behaviour for non Anycubic SLA printers.

Signed-off-by: Mimoja <git@mimoja.de>

* format/AnycubicSLA: Expose Antialiasing via material notes

Similiar to how the other machine configurations are exposed via the material notes
we are adding the Antialiasing config.

Signed-off-by: Mimoja <git@mimoja.de>

* Printer/sla: Add Anycubic Photon Mono and Mono SE

The Photon Mono and Mono SE are format compatible printers with the Mono X.
They support Version 1 and Version 515 binary archives.
We are implementing them as Version 1 priters to reduce the overhead and keep the code
in line with the Mono X.

The addition as Version 1 printers leaves some features unexposed, most noteably the Antialiasing
level configuration which is now always the maximum.

Given that the printers check the eligability of sliced files by file extension we are
poised to create per-printer sla_print default configurations to overwrite output_filename_format.

Tested: Successfully printed multiple objects. Changing the layer parameter on the onscreen display
succeeded.

---------

Signed-off-by: Mimoja <git@mimoja.de>
2023-04-05 15:05:18 +02:00
Filip Sykala - NTB T15p
da2d0282b1 Store text fix matrix, param use_surface and emboss 'depth'(size in emboss direction) by emboss Shape to 3mf
Do not store distance and angle to 3mf

Missing implementation for store ExPolygons to .3mf
2023-04-04 15:45:31 +02:00
YuSanka
102d3e0d2c Localization:
* Fixed phrases
* Updated POT
* New POT is merged with community POs
2023-04-03 11:32:50 +02:00
YuSanka
dcf5889cfa Fixed a save to 3mf: Added a check if cut information have to be saved to 3mf 2023-03-29 12:53:09 +02:00
tamasmeszaros
f1dd85309b Add back sla svg export alias 2023-03-28 12:11:19 +02:00
tamasmeszaros
c6ea4d19c9 change identification of sla archives with svg images 2023-03-28 10:27:21 +02:00
PavelMikus
8e0b45fc83 Fix compilation - add missing includes 2023-03-27 10:44:54 +02:00
Filip Sykala - NTB T15p
c0f8370bf4 Surface drag is not dependent on text configuration any more 2023-03-27 09:45:10 +02:00
YuSanka
19f2a1d9e9 Unified usage of localization macros in slic3r/libslic3r 2023-03-23 22:55:38 +01:00
David Kocik
d5f229a249 Refactoring of miniz extract calls. Use file_index instead of filename as identifier. 2023-03-17 11:08:49 +01:00
enricoturri1966
424ace119b #9822: Fix of reload from disk unavailable for 3mf files + Tech ENABLE_RELOAD_FROM_DISK_REWORK set as default 2023-03-03 08:56:32 +01:00
Filip Sykala - NTB T15p
3c961f3816 Move 3mf tag into Slic3r namespace - Break back compatibility with loading text volume
Use surface retype as int
2022-12-02 18:47:11 +01:00
Filip Sykala - NTB T15p
bffe75f0c3 Fix for:
../src/libslic3r/Format/3mf.cpp:686:37: error: 'path' is not a member of 'boost::filesystem'; did you mean 'boost::property_tree::path'?
../src/libslic3r/Format/3mf.cpp:2437:32: error: 'remove' is not a member of 'boost::filesystem'
../src/libslic3r/Format/3mf.cpp:2445:36: error: 'remove' is not a member of 'boost::filesystem'
../src/libslic3r/Format/3mf.cpp:2455:32: error: 'remove' is not a member of 'boost::filesystem'
../src/libslic3r/Format/3mf.cpp:2464:32: error: 'remove' is not a member of 'boost::filesystem'
../src/libslic3r/Format/3mf.cpp:2473:32: error: 'remove' is not a member of 'boost::filesystem'
../src/libslic3r/Format/3mf.cpp:2482:32: error: 'remove' is not a member of 'boost::filesystem'
../src/libslic3r/Format/3mf.cpp:2491:32: error: 'remove' is not a member of 'boost::filesystem'
../src/libslic3r/Format/3mf.cpp:2500:32: error: 'remove' is not a member of 'boost::filesystem'
../src/libslic3r/Format/3mf.cpp:2506:32: error: 'remove' is not a member of 'boost::filesystem'
../src/libslic3r/Format/3mf.cpp:2515:32: error: 'remove' is not a member of 'boost::filesystem'
../src/libslic3r/Format/3mf.cpp:2524:36: error: 'remove' is not a member of 'boost::filesystem'
../src/libslic3r/Format/3mf.cpp:2535:32: error: 'remove' is not a member of 'boost::filesystem'
../src/libslic3r/Format/3mf.cpp:2541:32: error: 'remove' is not a member of 'boost::filesystem'
../src/libslic3r/Format/3mf.cpp:2650:62: error: 'path' is not a member of 'boost::filesystem'; did you mean 'boost::property_tree::path'?
../src/libslic3r/Format/3mf.cpp:3315:129: error: 'path' is not a member of 'boost::filesystem'; did you mean 'boost::property_tree::path'?
2022-11-21 13:13:30 +01:00
YuSanka
fbcdd4191b Merge remote-tracking branch 'PRIVATE/master' into ys_emboss_with_master 2022-10-27 13:09:55 +02:00
YuSanka
d1c871758b Cut WIP:
* ObjectDataViewModel: Respect to the volume id, when adding the new volume to the object
* 3mf : Save/Load info about connectors
2022-09-29 14:36:47 +02:00
YuSanka
484eae7a1c Merge remote-tracking branch 'PRIVATE/master' into ys_cut 2022-09-08 13:32:14 +02:00
Filip Sykala - NTB T15p
c549c6afbe Merge branch 'master' into fs_emboss
# Conflicts:
#	src/libslic3r/CMakeLists.txt
#	src/libslic3r/Format/3mf.cpp
#	src/libslic3r/Model.hpp
#	src/libslic3r/Point.hpp
#	src/libslic3r/Technologies.hpp
#	src/slic3r/CMakeLists.txt
#	src/slic3r/GUI/GLCanvas3D.cpp
#	src/slic3r/GUI/GLSelectionRectangle.cpp
#	src/slic3r/GUI/GUI_Factories.hpp
#	src/slic3r/GUI/Gizmos/GLGizmoBase.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoBase.hpp
#	src/slic3r/GUI/Gizmos/GLGizmoMove.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoMove.hpp
#	src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoRotate.hpp
#	src/slic3r/GUI/MeshUtils.cpp
#	src/slic3r/GUI/MeshUtils.hpp
#	src/slic3r/GUI/ObjectDataViewModel.cpp
#	src/slic3r/GUI/ObjectDataViewModel.hpp
#	src/slic3r/GUI/Selection.cpp
2022-08-31 15:22:10 +02:00
Lukas Matena
d7a34f7e40 Merge branch 'master_250' 2022-08-30 16:31:07 +02:00
YuSanka
cf144da4fe Cut WIP: Import/Export cut information to/from .3mf file
+ Fixed a crash during change object selection, when CutGizmo is On
+ Fixed Undo/Redo (was accidentally broken with 7912613dc8e11db2ddea8018ce16b26a01756a3b)
2022-08-22 10:09:32 +02:00
Lukas Matena
e9f0f4bd0d Fix error message (related to #8703) 2022-08-17 22:21:09 +02:00
Lukas Matena
deac513faa Fixed conflicts after merge 2022-08-15 15:23:59 +02:00
Lukas Matena
bce2b148f4 Merged 2.5.0-beta1 into master (NO CONFLICTS FIXED) 2022-08-15 13:41:40 +02:00
Lukas Matena
661bb522cf Fixed compiler warnings 2022-08-12 09:40:19 +02:00
Lukas Matena
41f5bd006a STEP: Improved error reporting on Linux 2022-08-11 16:49:13 +02:00
tamasmeszaros
aff337067b Switch to statically linked OCCTWrapper on Apple.
Due to dmg notarization issues
2022-08-11 16:49:13 +02:00
tamasmeszaros
3f8979c95f Use prusa-slicer executable dir to search for occt shared lib 2022-08-11 16:49:13 +02:00
tamasmeszaros
1fd4659f0e Use resources dir for occt shared lib 2022-08-11 16:49:13 +02:00
Prusa Research a.s
7d3f0b4b32 Fixes on MacOS 2022-08-11 16:49:13 +02:00
tamasmeszaros
88ba89dbbc STEP: Implementation ported from BambuStudio:
CMake handling is different

STEP: Removed preprocessing stage

STEP: Small refactoring

STEP: Bigger refactoring

STEP: Changed naming on loaded object and volumes:
If the STEP contains exactly one named volume, the object and its first
volume will both have that name. Otherwise, filename w/o suffix is used
as object name and volumes are named using names from the STEP (if there
is none, untranslated "PartN" string is used).

STEP: Load the libraries dynamically on Win

wip
2022-08-11 16:49:13 +02:00