Commit Graph

1437 Commits

Author SHA1 Message Date
0fb2c4cfd7 Fixed conflicts after merge with master 2019-03-27 12:51:40 +01:00
00e19f6bd7 Fixed selection lost when Place on Face gizmo is active and user click on another object 2019-03-27 09:06:53 +01:00
0426ff1122 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring 2019-03-27 08:33:48 +01:00
431399daf9 Fix of #2029
+ Some improvements for the language changing
2019-03-26 18:02:26 +01:00
f527ed0a92 imgui: Fix assert caused by set_language() while new frame is open 2019-03-26 17:57:54 +01:00
fccf1692d8 Fixing broken statistics. 2019-03-26 16:45:04 +01:00
1bc35159ed Merge branch 'master' into tm_slice_index_lyrh 2019-03-26 16:06:52 +01:00
9fd9572691 void GLCanvas3D::update_gizmos_data() moved into void GLGizmosManager::update_data(GLCanvas3D& canvas) 2019-03-26 15:55:47 +01:00
2f1a35b49e Gizmos' grabbers size made uniform as the mean value of the selection's bounding box sides 2019-03-26 14:53:32 +01:00
871c365cc7 Handling of gizmos related key events moved into new method GLGizmosManager::on_key() 2019-03-26 14:38:30 +01:00
0119df2dfc Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring 2019-03-26 14:08:46 +01:00
ae402c1010 Handling of gizmos related char events moved into new method GLGizmosManager::on_char() 2019-03-26 14:08:02 +01:00
6736b7d3a7 Added tooltip [Ctrl - R] to the Slice now button 2019-03-26 14:00:53 +01:00
e3fa7b15be Code cleanup 2019-03-26 12:39:40 +01:00
a6a344a014 Handling of gizmos related mouse events moved into GLGizmosManager::on_mouse() 2019-03-26 12:30:17 +01:00
b1a331e43a Merging with master, solving conflicts. 2019-03-26 11:13:28 +01:00
d2c0d2641c Further refactor and simplification of slice index and print data. 2019-03-26 10:57:45 +01:00
4d1f8d0d46 Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-03-26 10:39:08 +01:00
df51a16ffe Improved SLA layer view: Low layer shall be rendered from the slice above,
triangulated slices are shifted slightly away from the clipping planes.

FDM: Ported a "(bridged)" G-code comment from upstream.
2019-03-26 10:38:50 +01:00
3d1c0f182f Fixed crash after change of a language
+ Updating of a mode after recreation
2019-03-26 10:09:53 +01:00
48f4831ffc Code cleanup 2019-03-26 09:10:35 +01:00
0337ac0839 1st installment of gizmos refactoring
1) GLCanvas3D::Gizmos moved into a standalone class GLGizmosManager

2) GLGizmosManager handles mouse events by calling its on_mouse method (wip)
2019-03-26 09:01:04 +01:00
d9d34630a5 Merge branch 'master' into tm_slice_index_lyrh 2019-03-25 19:02:35 +01:00
811c781852 Refactoring and commenting slice index solution. 2019-03-25 19:02:05 +01:00
c50986d7fd Code cleanup 2019-03-25 14:13:20 +01:00
4fa2a5e3b2 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_multivolume_models 2019-03-25 14:12:40 +01:00
b7691980f1 Fix of #1998 2019-03-25 12:07:43 +01:00
c0db8a6bfd Yet another tweak to the logic for releasing mouse capture into GLToolbar::on_mouse() 2019-03-25 08:48:41 +01:00
49ebb04be5 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_multivolume_models 2019-03-25 08:32:05 +01:00
1429a24af3 Fix of sla gizmo (it sometimes showed supports for hidden objects) 2019-03-24 13:35:09 +01:00
577a793570 Fixed caching of profile selections at the plater. 2019-03-23 10:04:44 +01:00
54f3c22988 Improved rendering when deleting an option from object's overrides.
Replaced the single column icon with an empty icon.
Will it break something? The single column added an ugly spacer
in front of non-editable combo boxes.
2019-03-23 08:23:22 +01:00
3aca36f27b Fix of Perl bindings 2019-03-22 23:10:11 +01:00
e9a7ccd786 Fixed the options override box at the side bar. 2019-03-22 23:00:23 +01:00
83c1e83181 Fixed the SLA layer preview. 2019-03-22 21:26:58 +01:00
f8a9bbaadc Merge remote-tracking branch 'origin/tm_slice_index' 2019-03-22 17:08:38 +01:00
f8f559dde9 Refactored the -------- xxxx ---------- menu items to use a generic
code to generate these separators.
Now using the connected dashes (unicode emdash characters) on OSX and Windows.
2019-03-22 17:07:12 +01:00
ca1981d5a4 Merge branch 'master' into tm_slice_index 2019-03-22 15:48:57 +01:00
59d21b981a Call Config Wizard from the Printer combo box at both the plater
and the parameter tab.
2019-03-22 15:45:51 +01:00
65a1eb7d3f Merge branch 'master' into tm_slice_index 2019-03-22 15:31:58 +01:00
c410216e45 Refactoring changes to the slice index. 2019-03-22 15:31:38 +01:00
3733410e55 Another tweak to the logic for releasing mouse capture into GLToolbar::on_mouse() 2019-03-22 14:35:26 +01:00
584f7ad296 Changed logic for releasing mouse capture into GLToolbar::on_mouse() 2019-03-22 13:03:34 +01:00
73a5d7565a Fix of 1.42 beta crash when deleting printer profile created by configuration assistant #1985
Fixed an issue, where deleting a profile did not correctly update
profile dependences, and deleting a profile would not test dirty status
of depending profiles, which would be switched thus user changes would be lost.

Fixed enabling / disabling the --default FFF-- / --default SLA-- profiles
when deleting the last printer profile.

Little refactoring (don't compare by strings but by symbolic names).

Making a copy of a profile - "Copy" suffix is added to a system profile.
2019-03-22 12:11:23 +01:00
64e71aec14 Fixed non-uniform scale of single volumes selection when made using the sidebar matrix fields 2019-03-22 11:51:10 +01:00
9c7a063aa5 SLA gizmo fix: adding points to selection by Shift+click should now work again (was broken by 8466c55) 2019-03-22 10:56:51 +01:00
07686d8df9 Do not consider modifiers when centering an object after 3mf and amf import 2019-03-22 09:47:40 +01:00
b75341ce7d Fixes for the duplicated layer issues... 2019-03-21 18:01:41 +01:00
6f54bbb01a Merge branch 'master' into tm_slice_index 2019-03-21 15:17:01 +01:00
3218d37714 FIx for broken slice preview 2019-03-21 15:16:33 +01:00