213 Commits

Author SHA1 Message Date
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
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
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
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
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
enricoturri1966
040a8467bd #8401 - Show error message when trying to import invalid 3mf 2022-06-14 12:17:15 +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
a5ae6394a5 Fix warnings 2022-04-05 13:08:01 +02:00
Filip Sykala
c88d9452c0 Fix transformation of embossed text after load volume from .3mf 2022-04-05 12:23:05 +02:00
Filip Sykala
447e58254d Fix 3mf trmat - wrong reload 2022-04-04 09:57:19 +02:00
Filip Sykala
7f46594635 Fix of baked transformation into volume during store to 3mf 2022-03-30 19:52:19 +02:00
Filip Sykala
6cdba760c9 Say about not loadable font face when select it 2022-03-30 12:56:17 +02:00
Filip Sykala
5de670c1b8 Try to reduce includes in 3mf.cpp on boost 2022-03-30 09:27:55 +02:00
Filip Sykala
50d52404d8 Try fix of OsX build by change order of include 2022-03-25 15:49:57 +01:00
enricoturri1966
f970741dd4 Do not show ProjectDropDialog when drag and dropping a 3mf file produced by other softwares and the plater is not empty 2022-03-23 17:20:50 +01:00
Filip Sykala
60fcd11ef8 vojta wants 2022-03-21 14:58:03 +01:00
Vojtech Bubnik
c11948a084 FontItem improvmement: Use default constructors to let the compiler
generate move constructor and move assignement.
Also used some move operators to reduce unnecessary memory allocations.

Cherry picked commit: 120a85d4c4b90ffafced442ee5e63e5f794f6945
2022-03-17 12:37:21 +01:00
Filip Sykala
f4fc23ce0d fix init of string 2022-03-08 09:30:50 +01:00
Filip Sykala
41a506688a Change 2 map to bimap in TextConfigurationSerialization 2022-03-08 08:35:26 +01:00
Filip Sykala
6fdaee3cfe Fix data type of collection
Fix warnings
../src/libslic3r/Emboss.cpp:135:24: warning: comparison of integer expressions of different signedness: 'int' and 'const unsigned int' [-Wsign-compare]
../src/libslic3r/Emboss.cpp:653:20: warning: comparison of integer expressions of different signedness: 'int' and 'unsigned int' [-Wsign-compare]
../src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp:2057:12: warning: unused variable 'count_icons' [-Wunused-variable]
../src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp:2058:12: warning: unused variable 'count_states' [-Wunused-variable]
2022-03-07 12:16:24 +01:00
Filip Sykala
f35065b77f Fix for commit 8792331516d5f4fe94cdc07294f6b3d374e77c2b
add escape of special symbols
2022-03-03 12:58:05 +01:00
Filip Sykala
4e97830c2b Fix of commit 4c416bc747b453c783c46198b342babe5777236b
Separate escape characters of double quotted XML attribute value
2022-03-02 08:40:27 +01:00
Filip Sykala
18d269506a add index of font inside of collection to FontProp(font property) + serialization/deserialization (3mf + appConfig)
separate glyph cache from FontFile
2022-02-28 18:32:50 +01:00
Filip Sykala
7c95f8f9aa store / load .3mf TextConfiguration: distance from surface & rotation for move text over surface
store / load appConfig distance from surface & rotation for move text over surface
2022-02-18 13:01:40 +01:00
Filip Sykala
faa63f3182 Merge branch 'master' into fs_emboss
# Conflicts:
#	src/libslic3r/Format/3mf.cpp
2022-02-10 14:04:02 +01:00
enricoturri1966
30dc2bf39c Do not show ProjectDropDialog when drag and dropping a 3mf file produced by other softwares and the plater is not empty 2022-02-04 09:52:00 +01:00
enricoturri1966
7d87490777 Tech ENABLE_RELOAD_FROM_DISK_REWORK - A bunch of bug fixes in Reload from disk command:
1) Lost orientation after reload from disk (SPE-1182)

2) Wrong objects replacement from reload from disk command (SPE-1183)

3) Reload from disk not disabled for built-in models (SPE-1184)
2022-02-02 14:25:36 +01:00
Lukas Matena
5c616c5931 Sync to 2.4.1-beta1 2022-02-01 14:16:13 +01:00
Lukas Matena
ebb9041041 Merge branch 'master' into stable - no conflicts fixed 2022-02-01 14:15:18 +01:00
Filip Sykala
ef6860d4ee Move font property inside of font item to store together with font 2022-01-07 18:50:57 +01:00
Filip Sykala
82ee1c5e4a Add boldness and skew(italic) for embossed text
Change line_gap and char_gap to optional value
2022-01-05 16:56:20 +01:00
Filip Sykala
d698df2c31 Merge branch 'master' into fs_emboss
# Conflicts:
#	src/slic3r/GUI/GUI_App.cpp
#	tests/libslic3r/test_indexed_triangle_set.cpp
2021-12-01 14:35:42 +01:00
enricoturri1966
781b457035 Tech ENABLE_SAVE_COMMANDS_ALWAYS_ENABLED set as default 2021-11-30 09:41:43 +01:00
Filip Sykala
2bf876e96c Add font family to .3mf 2021-11-04 13:47:51 +01:00
Filip Sykala
bbeff0f2e6 store to .3mf 2021-10-29 13:32:54 +02:00
Filip Sykala
6a102cba99 Create wxFont from font property 2021-10-29 11:53:23 +02:00
Filip Sykala
d2dda18753 Remove Flatness and deduce it from font size 2021-10-27 15:47:51 +02:00
Filip Sykala
b5a075ce4a Merge branch 'master' into fs_emboss 2021-10-26 18:58:38 +02:00
Filip Sykala
706d963f7f Different font type by OS
Connect size with wxFont
2021-10-26 18:56:19 +02:00