94 Commits

Author SHA1 Message Date
Filip Sykala - NTB T15p
c77f8373bd Merge branch 'master' into fs_emboss
# Conflicts:
#	src/libslic3r/Technologies.hpp
#	src/slic3r/GUI/GLCanvas3D.cpp
#	src/slic3r/GUI/Gizmos/GLGizmosManager.cpp
#	src/slic3r/GUI/Plater.cpp
#	src/slic3r/GUI/Selection.hpp
2022-11-07 15:44:33 +01:00
enricoturri1966
da5a9277fa Tech ENABLE_MEASURE_GIZMO set as default 2022-11-02 08:50:12 +01:00
enricoturri1966
908634d5b7 Measuring - Gizmo measure - Disable background fadeout animation when showing imgui modal dialog to edit distance 2022-10-12 09:46:11 +02:00
enricoturri1966
395cab88ba Measuring: prototype for uniformly scale a volume by editing the value of the shown distance
Fixed conflicts while rebasing to master
2022-10-12 09:45:53 +02:00
Filip Sykala - NTB T15p
0e3b7cae12 Merge branch 'master' into fs_emboss
# Conflicts:
#	src/libslic3r/Technologies.hpp
#	src/slic3r/GUI/GLCanvas3D.cpp
2022-09-29 18:47:21 +02:00
enricoturri1966
3513b800a0 Tech ENABLE_PREVIEW_LAYOUT set as default 2022-09-29 14:23:41 +02:00
enricoturri1966
524e55edd9 Tech ENABLE_LEGEND_TOOLBAR_ICONS set as default 2022-09-29 12:19:20 +02:00
Filip Sykala - NTB T15p
3bd557b177 Escape ## in name of style in imgui visualization(issue 61) 2022-09-21 15:15:32 +02:00
Filip Sykala
331d4d4557 Show user warning about unknown symbols by font inside of input text
Fix correct selection of collection ascent, descent, ...
Remove boost log from emboss --> not work properly on thread
2022-04-07 16:34:14 +02:00
Filip Sykala
ad1510a30c Start using string_view in truncate text 2022-03-03 08:13:00 +01:00
Filip Sykala
a0dde4651b Add default value to optional input
Remove unnecessary addiction to canvas3d in imgui wrapper
2022-03-02 14:34:25 +01:00
Filip Sykala
a8ef5c35d2 Undo changes for input 2022-02-18 12:33:39 +01:00
Filip Sykala
84cd85e243 Fix advanced alliment + translation for calc offsets 2022-02-16 08:41:56 +01:00
Filip Sykala
a50d93cd66 Merge branch 'master' into fs_emboss
# Conflicts:
#	src/libslic3r/Geometry.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoBase.cpp
#	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/Gizmos/GLGizmoScale.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoScale.hpp
#	src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp
#	src/slic3r/GUI/ImGuiWrapper.cpp
#	src/slic3r/GUI/ImGuiWrapper.hpp
#	src/slic3r/GUI/Selection.cpp
#	tests/slic3rutils/slic3r_jobs_tests.cpp
2022-02-02 15:27:25 +01:00
enricoturri1966
b9b702d550 Fixed conflicts after merge with branch dev 2022-01-14 09:55:13 +01:00
enricoturri1966
6201dad245 Tech ENABLE_COLOR_CLASSES set as default 2022-01-14 08:19:00 +01:00
enricoturri1966
a2dc1cd446 Fixed conflicts after merge with dev branch 2022-01-12 15:54:48 +01:00
enricoturri1966
243f5c38ee Tech ENABLE_ENHANCED_IMGUI_SLIDER_FLOAT set as default 2022-01-12 13:36:31 +01:00
Filip Sykala
3e0bc4a529 Only unique name of font item
Add FontListSerializable for store/load font list from AppConfig
2022-01-10 10:59:10 +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
enricoturri1966
cd4094743e Tech ENABLE_COLOR_CLASSES - 1st installment -> Introduction of classes ColorRGB and ColorRGBA to unify color data definition and manipulation 2021-12-22 10:45:35 +01:00
Filip Sykala
1259b878fb add NSVG utils into cmakelists
Move trunc to ImGuiWrapper
2021-12-20 21:58:21 +01:00
Filip Sykala
88523bceb6 Merge branch 'master' into fs_emboss 2021-12-13 10:52:04 +01:00
enricoturri1966
f958c14db8 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_preview_layout 2021-12-09 09:03:20 +01:00
Lukas Matena
06fd732b57 Fixed behaviour of float sliders in SLA gizmos,
which was broken after the 'Edit' button was added.
This is a bit hacky fix, it might be worth improving later.
2021-12-08 16:19:08 +01:00
enricoturri1966
8bc442cd32 Tech ENABLE_ENHANCED_IMGUI_SLIDER_FLOAT - 2nd click on edit button exits editing state in slider 2021-11-29 11:46:28 +01:00
Filip Sykala
eba68f9a9e Merge branch 'master' into fs_emboss
# Conflicts:
#	src/slic3r/GUI/GUI_ObjectList.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp
#	src/slic3r/GUI/ImGuiWrapper.hpp
2021-11-23 09:09:09 +01:00
enricoturri1966
c242f31353 Fixed conflicts after merge with master 2021-11-23 08:48:11 +01:00
Vojtech Bubnik
56f409921c Improved some string initialization and zeroing.
Assigning = "" in constructor does not make sense,
.clear() is better than = "",
default paramaeter = {} is cheaper than = ""
2021-11-19 15:34:22 +01:00
Lukáš Hejl
8a4323c5b9 Fixed the layout of the painting gizmos after the edit icon for sliders was added. 2021-11-17 11:44:38 +01:00
enricoturri1966
a326c5b320 Tech ENABLE_LEGEND_TOOLBAR_ICONS - Toolbar items in legend using svn icons 2021-11-12 14:04:37 +01:00
Filip Sykala
f799c0a3b0 fix include polygon 2021-11-12 13:43:03 +01:00
enricoturri1966
dd484e42fc Fixed conflicts after merge with master 2021-11-12 08:08:54 +01:00
Lukáš Hejl
f94a1dbb48 Added a missing include (GCC 11.1). 2021-11-10 23:21:36 +01:00
Filip Sykala
378d8af7ac Set fine position 2021-11-08 12:18:10 +01:00
enricoturri1966
f7662682c8 Tech ENABLE_ENHANCED_IMGUI_SLIDER_FLOAT - Modified ImGuiWrapper::slider_float() to create a compound widget where an additional button can be used to set the keyboard focus into the slider to allow the user to type in the desired value 2021-11-05 14:46:44 +01:00
enricoturri1966
fe6b288743 Fixed conflicts after merge with master 2021-10-25 12:44:59 +02:00
Filip Sykala
6c8f754186 Merge branch 'master' into fs_emboss
# Conflicts:
#	src/slic3r/GUI/3DScene.cpp
2021-10-19 13:40:19 +02:00
Lukáš Hejl
5a1809579e Fixed unintended space after ImGui::SliderFloat in the hollow and sla supports gizmos. 2021-10-19 12:54:46 +02:00
enricoturri1966
3d22cc096f Fixed conflicts after merge with master 2021-10-19 12:08:43 +02:00
Lukáš Hejl
6f3baf9262 Added tooltips to the support painting gizmo. Used multi-line text for the label "Highlight overhang by angle". 2021-10-18 10:57:57 +02:00
Lukáš Hejl
b2fc50c9d9 Small refactoring of showing tooltips in gizmos. 2021-10-18 10:56:50 +02:00
Filip Sykala
7d1de0113a Show multi line text box with selected font, add letter 2021-10-12 19:19:09 +02:00
enricoturri1966
e088a9fc36 Tech ENABLE_PREVIEW_LAYOUT - View type combo popup has now adaptive height 2021-09-29 13:30:18 +02:00
enricoturri1966
e12cf58c91 Tech ENABLE_PREVIEW_LAYOUT - Replace options combo in bottom toolbar with toolbar in legend 2021-09-24 09:22:50 +02:00
Lukas Matena
e93c5d4f20 ImGui sliders clamping:
ImGuiWrapper::slider_float now clamps the value returned by imgui by default. Bare ImGui::SliderFloat
allows entering off-scale values when entered by keyboard, which is not nice. The protection can
be turned off by the last optional parameter.
2021-07-22 15:50:48 +02:00
enricoturri1966
0c6f66eca6 GCodeViewer -> Tweaks in legend rendering 2020-08-06 13:36:21 +02:00
enricoturri1966
25c3552555 Fixed conflicts after merge with master 2020-08-04 09:58:19 +02:00
David Kocik
b3f8ae5ca7 Notifications & warning dialog
notifications
dialog with warnings produced by slicing is shown before exporting
2020-08-03 15:49:25 +02:00
enricoturri1966
69a0a1c96e Fixed conflicts after merge with master 2020-08-03 08:56:58 +02:00