311 Commits

Author SHA1 Message Date
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
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
Lukáš Hejl
c9ddf7315e Replaced parameters wall_add_middle_threshold and wall_split_middle_threshold with automatic computation based on extrusion width.
That allows computed better values in cases when the extrusion width of the first layer or for the infill differs from the extrusion width for perimeters.

Parameters min_feature_size and wall_transition_length now can be set in percentages, and then they will be calculated based on nozzle size. Old profiles with default values are forced to replace old default values with new default values in percentages.
2022-08-08 10:21:55 +02:00
Filip Sykala - NTB T15p
003c7fc54f Rename FontItem to EmbossStyle 2022-08-03 10:29:05 +02:00
Filip Sykala - NTB T15p
e9d65da046 Add stylename into 3mf 2022-07-27 10:08:03 +02:00
enricoturri1966
a3aab02f56 Fixed warning 2022-07-21 08:47:29 +02:00
Filip Sykala - NTB T15p
79a7f588b9 Merge branch 'et_world_coordinates' into fs_emboss
# Conflicts:
#	src/libslic3r/CMakeLists.txt
#	src/libslic3r/Format/3mf.cpp
#	src/libslic3r/Model.hpp
#	src/libslic3r/Technologies.hpp
#	src/slic3r/GUI/GLCanvas3D.cpp
#	src/slic3r/GUI/GUI_App.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoBase.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoBase.hpp
#	src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp
#	src/slic3r/GUI/Selection.cpp
#	src/slic3r/GUI/Selection.hpp
2022-07-20 13:02:07 +02:00
Lukas Matena
b61714bb3e Merge branch 'master_250' (NO CONFLICTS FIXED):
CONFLICT (content): Merge conflict in resources/profiles/PrusaResearch.idx
CONFLICT (content): Merge conflict in resources/profiles/PrusaResearch.ini
CONFLICT (content): Merge conflict in src/libslic3r/CMakeLists.txt
CONFLICT (content): Merge conflict in src/libslic3r/Fill/Fill.cpp
CONFLICT (content): Merge conflict in src/libslic3r/GCode.cpp
CONFLICT (content): Merge conflict in src/libslic3r/GCode.hpp
CONFLICT (content): Merge conflict in src/libslic3r/GCode/GCodeProcessor.cpp
CONFLICT (content): Merge conflict in src/libslic3r/GCode/GCodeProcessor.hpp
CONFLICT (content): Merge conflict in src/libslic3r/GCode/SeamPlacer.cpp
CONFLICT (content): Merge conflict in src/libslic3r/GCode/SeamPlacer.hpp
CONFLICT (add/add): Merge conflict in src/libslic3r/Geometry/Curves.hpp
CONFLICT (content): Merge conflict in src/libslic3r/PerimeterGenerator.cpp
CONFLICT (content): Merge conflict in src/libslic3r/Point.hpp
CONFLICT (content): Merge conflict in src/libslic3r/PrintConfig.hpp
CONFLICT (content): Merge conflict in src/slic3r/GUI/ConfigWizard.cpp
CONFLICT (content): Merge conflict in src/slic3r/GUI/GCodeViewer.cpp
CONFLICT (content): Merge conflict in src/slic3r/GUI/GLCanvas3D.cpp
CONFLICT (content): Merge conflict in src/slic3r/GUI/GUI_App.cpp
CONFLICT (content): Merge conflict in src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp
CONFLICT (content): Merge conflict in src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp
CONFLICT (content): Merge conflict in src/slic3r/Utils/FixModelByWin10.cpp
CONFLICT (modify/delete): t/perimeters.t deleted in HEAD and modified in master_250.  Version master_250 of t/perimeters.t left in tree.
CONFLICT (content): Merge conflict in tests/fff_print/CMakeLists.txt
CONFLICT (content): Merge conflict in tests/fff_print/test_fill.cpp
CONFLICT (content): Merge conflict in version.inc
CONFLICT (modify/delete): xs/xsp/PerimeterGenerator.xsp deleted in HEAD and modified in master_250.  Version master_250 of xs/xsp/PerimeterGenerator.xsp left in tree.
2022-06-29 14:37:14 +02:00
enricoturri1966
040a8467bd #8401 - Show error message when trying to import invalid 3mf 2022-06-14 12:17:15 +02:00
YuSanka
906f8914a6 SLA estimation time:
* A calculation of the estimation of a print time is ported from the FW
  (See https://gitlab.com/prusa3d/sl1/sla-fw/-/blob/1.7/slafw/project/project.py#L485)
* Some missed parameters are added to the Printer Presets
2022-06-02 09:29:11 +02:00
Filip Sykala
ca848b0a14 Merge branch 'master' into fs_emboss
# Conflicts:
#	src/libslic3r/Format/3mf.cpp
#	src/slic3r/GUI/Selection.cpp
2022-05-24 23:04:36 +02:00
enricoturri1966
6365e54b1f Fixed loading of 3mf files containing single volume instances where the volume is shifted with respect to the instance origin 2022-05-20 10:39:51 +02:00
Filip Sykala
864d1e5830 Cut surface in backend job
Store flag about use surface(into 3mf and style)
GUI: Add checkbox to start using model surface
2022-05-04 19:42:39 +02:00
Filip Sykala
3e9778b46b Merge branch 'et_world_coordinates' into fs_emboss 2022-05-02 10:11:47 +02:00
tamasmeszaros
7cf893fe81 Fix memory corruption in svg parsing 2022-04-26 15:26:29 +02:00
tamasmeszaros
4148d7332e Prohibit multiple formats with the same extension (zip)
Archive format can be specified as a hint when a reader is created.
2022-04-26 14:43:28 +02:00
tamasmeszaros
24c9ce6e14 Fix the issue with point skipping in svg export 2022-04-26 13:26:13 +02:00
tamasmeszaros
73837c2f82 Add more comments 2022-04-26 11:30:55 +02:00
tamasmeszaros
784105f5ad Extend sla archive tests with read-back 2022-04-26 10:57:49 +02:00
tamasmeszaros
0025a65611 Add comment 2022-04-26 09:44:00 +02:00
tamasmeszaros
32a923da93 Archive reader types are now registered in one place 2022-04-26 09:38:03 +02:00
tamasmeszaros
885e6964ba Working svg import
Strange bug in export, see line 111
2022-04-26 09:38:03 +02:00
tamasmeszaros
4ef860811f Wip on svg archive import 2022-04-26 09:38:03 +02:00
tamasmeszaros
e0fc337b2d Get rid of window size parameter from import interface
Make 'Balanced' the default import quality
2022-04-26 09:38:03 +02:00
tamasmeszaros
5ecf29f303 Separate existing sla archive import code 2022-04-26 09:38:03 +02:00
Filip Sykala
7ec422d12f Merge branch 'et_world_coordinates' into fs_emboss
# Conflicts:
#	src/libslic3r/Model.hpp
#	src/libslic3r/Technologies.hpp
#	src/slic3r/GUI/Gizmos/GLGizmoBase.hpp
2022-04-20 12:13:17 +02:00
tamasmeszaros
516f459edc Use tight compression for SLA archives with svg 2022-04-19 13:53:50 +02:00