486 Commits

Author SHA1 Message Date
Filip Sykala - NTB T15p
fcdaf6acbf Show key shortcut in the title of text emboss window 2023-07-25 08:26:13 +02:00
Filip Sykala - NTB T15p
0588c66ce5 Fix
../src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp:131:13: warning: unused function 'start_create_volume_on_surface_job' [-Wunused-function]
../src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp:3772:6: warning: unused function 'apply_camera_dir' [-Wunused-function]
../src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp:1143:6: warning: unused function 'init_new_text_line' [-Wunused-function]
../src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp:1332:13: warning: unused function 'is_text_empty' [-Wunused-function]
2023-07-12 13:36:52 +02:00
Filip Sykala - NTB T15p
9ee86599d5 Merge branch 'fs_dir_per_glyph_SPE-1597' into fs_svg
# Conflicts:
#	src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoEmboss.hpp
2023-06-30 10:15:51 +02:00
Filip Sykala - NTB T15p
52578e88a5 Merge branch 'fs_fix_font_preview_offsets' into fs_dir_per_glyph_SPE-1597 2023-06-15 12:49:42 +02:00
Filip Sykala - NTB T15p
9624222c3e Fix for font preview offsets on scaled displayes:
https://github.com/prusa3d/PrusaSlicer/issues/10511
2023-06-15 12:12:30 +02:00
Filip Sykala - NTB T15p
1c80d4358a Render texture of svg 2023-06-09 17:49:48 +02:00
Filip Sykala - NTB T15p
3e0cd9a872 Merge branch 'fs_dir_per_glyph_SPE-1597' into fs_svg 2023-06-07 11:26:54 +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
09e9193d92 Fix position of definition 2023-06-05 14:20:11 +02:00
Filip Sykala - NTB T15p
ed4948742c fix for:
../src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp:1458:14: warning: unused variable 'is_outside' [-Wunused-variable]
../src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp:3445:62: warning: suggest parentheses around '&&' within '||' [-Wparentheses]
2023-06-02 10:33:21 +02:00
Filip Sykala - NTB T15p
e05ff3e7a6 fix load of 3mf with per glyph transformation by stored fix matrix 2023-05-29 06:08:25 +02:00
Filip Sykala - NTB T15p
2471e072d3 Base line on third of ascent is better 2023-05-26 19:57:49 +02:00
Filip Sykala - NTB T15p
331bfaa556 Fix position of base line for per glyph position to be on the half of ascent in all vertical alignment 2023-05-26 19:44:32 +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
1e2943b942 Align by buttons 2023-05-26 09:23:09 +02:00
Filip Sykala - NTB T15p
d2a605ee2e add option to Create per glyph volume (initialize text lines before text volume)
Per glyph for negative volume and modifiers are moved into object
2023-05-25 13:01:30 +02:00
Filip Sykala - NTB T15p
9b8f910c61 Ui for per glyph checkbox 2023-05-23 20:32:54 +02:00
Filip Sykala - NTB T15p
35044e29c3 Create text volume with feature per letter transformation. 2023-05-23 10:30:14 +02:00
Filip Sykala - NTB T15p
4be73de02f Partialy fix align:
whitechar in center
enters at begining
enters at end
Align
2023-05-19 14:11:15 +02:00
Filip Sykala - NTB T15p
cf57bf02ff Fix init after set 2023-05-09 13:43:57 +02:00
Filip Sykala - NTB T15p
43294950bd Per letter emboss with align 2023-05-09 13:00:49 +02:00
Filip Sykala - NTB T15p
28b526167a Add text alignement 2023-05-04 19:13:13 +02:00
Filip Sykala - NTB T15p
af0ef21ce3 Emboss text along base line(object cut)
- need alignment of text(center, left, right)
- (NOTE) edit text change its position
+ add polygon point
2023-05-04 11:57:33 +02:00
Filip Sykala - NTB T15p
7fa1e39fec One GLModel for all lines 2023-05-02 12:26:58 +02:00
Filip Sykala - NTB T15p
b7549ae414 Add TextLines to add per glyph transformation 2023-04-28 15:42:55 +02:00
Filip Sykala - NTB T15p
034b0a6118 Visualize flat 2023-04-20 17:16:30 +02:00
Filip Sykala - NTB T15p
14c7f27bff Visualization of slice for object contour to put letters on 2023-04-20 15:49:06 +02:00
Filip Sykala - NTB T15p
dc7a39e3e4 Set nullptr in cpp not hpp - Linux want know the size of pimpl. 2023-04-19 13:49:37 +02:00
Filip Sykala - NTB T15p
ea84072f55 Add option to change size 2023-04-18 23:15:37 +02:00
Filip Sykala - NTB T15p
51441bc5f0 Emboss SVG shape 2023-04-18 13:44:31 +02:00
Filip Sykala - NTB T15p
b3d2dbeeb3 Merge branch 'master' into fs_svg
# Conflicts:
#	src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp
2023-04-17 15:54:02 +02:00
Filip Sykala - NTB T15p
ed911260ee Fix for rotation text object by draging angle input(in advance). 2023-04-17 11:05:55 +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
Filip Sykala - NTB T15p
a7c5a8fda9 In simple mode is possible create only Text object 2023-04-04 13:26:05 +02:00
Filip Sykala - NTB T15p
c6d5013e9a Allowe edit text objects in simple mode 2023-04-04 13:18:55 +02:00
Filip Sykala - NTB T15p
10a85c10a5 Merge branch 'master' into fs_undoredo 2023-04-03 16:33:27 +02:00
Filip Sykala - NTB T15p
ad81d530b1 Fix of freez when undo redo on text with modifier. 2023-04-03 16:24:07 +02:00
Filip Sykala - NTB T15p
b9ac8aeafa Fix for crash 2023-04-03 14:07:16 +02:00
YuSanka
102d3e0d2c Localization:
* Fixed phrases
* Updated POT
* New POT is merged with community POs
2023-04-03 11:32:50 +02:00
Filip Sykala - NTB T15p
482b56f108 Merge branch 'master' into fs_undoredo 2023-04-03 11:15:07 +02:00
YuSanka
41026d47b6 EmbossGizmo: Fixed some phrases to improve localization 2023-03-31 14:31:22 +02:00
Filip Sykala - NTB T15p
4cf8d671cb Change imgui dialog in emboss to wxWidget dialog for better styling. 2023-03-31 13:36:35 +02:00
Filip Sykala - NTB T15p
dd7a19505a Another approach to fix undo redo:
Do not open gizmo on shortcut key: only create volume
2023-03-30 19:04:29 +02:00
Filip Sykala - NTB T15p
58e3143ad8 Different handling of shortcut 'T' for emboss text 2023-03-30 18:16:59 +02:00
Filip Sykala - NTB T15p
827d08d090 add more comment 2023-03-30 12:37:50 +02:00
Filip Sykala - NTB T15p
e966b1e0cd Merge branch 'master' into fs_undoredo 2023-03-30 11:58:28 +02:00
Filip Sykala - NTB T15p
ba715ea005 fix you can't reselect to another text object 2023-03-30 11:58:02 +02:00
Filip Sykala - NTB T15p
471d8df398 Fix right button dragging 2023-03-30 11:49:23 +02:00
YuSanka
eb2c121f94 Follow-up cc5660ad8c - Fixed tooltip texts 2023-03-29 14:20:31 +02:00