3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,090 Commits 1 Branch 1 Tag 249 MiB
ed8b1a7ecb
Commit Graph

1542 Commits

Author SHA1 Message Date
Enrico Turri
af3a32b8a0 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring 2019-03-28 09:30:23 +01:00
Enrico Turri
9b3f1a8942 Small refactoring -> GLGizmosManager gets model from selection and not from canvas 2019-03-28 09:30:01 +01:00
bubnikv
fc49abc2a4 Merge remote-tracking branch 'remotes/origin/tm_sla_png_minz' 2019-03-28 09:14:37 +01:00
Enrico Turri
98a848d239 Layers editing initialized only for 3D view and not for g-code preview 2019-03-28 09:12:32 +01:00
Enrico Turri
a4f404a6a4 Selection enabled only for 3D view and not for g-code preview 2019-03-28 08:44:46 +01:00
Enrico Turri
702186eec3 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring 2019-03-28 08:24:25 +01:00
YuSanka
3c163285e5 Fix of SPE-879 and #2021 2019-03-27 17:00:29 +01:00
Enrico Turri
46eafca0eb Follow-up of 8ea8eb67e4, utf-8 path conversion moved into nanosvg library 2019-03-27 15:42:01 +01:00
Enrico Turri
d0046283fa Added #define glcheck() for the case HAS_GLSAFE not defined 2019-03-27 15:14:40 +01:00
Enrico Turri
8459410e3c Fixed conflicts after merge with master 2019-03-27 14:57:05 +01:00
Enrico Turri
d795f07e7b Added glsafe() around OpenGL calls where missing 2019-03-27 14:42:09 +01:00
Lukas Matena
490074a2dd SLA gizmo now turns off in case someone adds an object/instance (to prevent rendering points in thin air, etc.) 
Also, a bug appering when adding an object larger than the bed and scaling it down was fixed (sla gizmo did not work correctly in that case)
 2019-03-27 14:19:12 +01:00
Vojtech Kral
1e9e378659 Fix string access in Preferences.cpp 2019-03-27 13:53:00 +01:00
YuSanka
87febaacc0 Fix of #2014 2019-03-27 13:19:27 +01:00
Enrico Turri
30c4e4fed6 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring 2019-03-27 12:51:59 +01:00
Enrico Turri
c44b6a30f9 Fixed conflicts after merge with master 2019-03-27 12:51:40 +01:00
Vojtech Kral
734d57a714 Fix build on MSVC with PCH off 2019-03-27 12:14:34 +01:00
Enrico Turri
8ea8eb67e4 Fixed loading of SVG textures from utf-8 paths 2019-03-27 12:02:50 +01:00
Vojtech Kral
8dbbfc140b
Merge pull request #2005 from SijmenSchoon/fix-assertions 
Fix tree-related assertions on startup on Linux
 2019-03-27 11:29:32 +01:00
tamasmeszaros
bc74761513 Integrating new step, removing old and unused steps. 2019-03-27 10:59:29 +01:00
bubnikv
84ff7f4221 Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-03-27 10:27:01 +01:00
bubnikv
3987296b62 Improved glsafe macro to print out file name, line number and function 
name on OpenGL assert.
 2019-03-27 10:26:55 +01:00
Enrico Turri
3cd6db2278 Fixed selection lost when Place on Face gizmo is active and user click on another object 2019-03-27 09:06:53 +01:00
Enrico Turri
000542f48d Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring 2019-03-27 08:33:48 +01:00
YuSanka
c8291c6e52 Fix of #2029 
+ Some improvements for the language changing
 2019-03-26 18:02:26 +01:00
Vojtech Kral
937f6112ce imgui: Fix assert caused by set_language() while new frame is open 2019-03-26 17:57:54 +01:00
tamasmeszaros
4d8800bc8a Fixing broken statistics. 2019-03-26 16:45:04 +01:00
tamasmeszaros
4c972549fb Merge branch 'master' into tm_slice_index_lyrh 2019-03-26 16:06:52 +01:00
Enrico Turri
fee0a6b6b5 void GLCanvas3D::update_gizmos_data() moved into void GLGizmosManager::update_data(GLCanvas3D& canvas) 2019-03-26 15:55:47 +01:00
Enrico Turri
1fbdf7bdaa Gizmos' grabbers size made uniform as the mean value of the selection's bounding box sides 2019-03-26 14:53:32 +01:00
Enrico Turri
47c39f51e5 Handling of gizmos related key events moved into new method GLGizmosManager::on_key() 2019-03-26 14:38:30 +01:00
Enrico Turri
52f11a6f0d Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring 2019-03-26 14:08:46 +01:00
Enrico Turri
d18208458b Handling of gizmos related char events moved into new method GLGizmosManager::on_char() 2019-03-26 14:08:02 +01:00
bubnikv
0a3500b5ab Added tooltip [Ctrl - R] to the Slice now button 2019-03-26 14:00:53 +01:00
Enrico Turri
c1d74d2943 Code cleanup 2019-03-26 12:39:40 +01:00
Enrico Turri
eafdcb04ba Handling of gizmos related mouse events moved into GLGizmosManager::on_mouse() 2019-03-26 12:30:17 +01:00
tamasmeszaros
a49643ebdb Merging with master, solving conflicts. 2019-03-26 11:13:28 +01:00
tamasmeszaros
57e28b53f2 Further refactor and simplification of slice index and print data. 2019-03-26 10:57:45 +01:00
bubnikv
82321c7aee Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-03-26 10:39:08 +01:00
bubnikv
e0e1e2b682 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
YuSanka
910979cf73 Fixed crash after change of a language 
+ Updating of a mode after recreation
 2019-03-26 10:09:53 +01:00
Enrico Turri
a09197879d Code cleanup 2019-03-26 09:10:35 +01:00
Enrico Turri
3818bfa19a 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
tamasmeszaros
b4ea43a6b0 Merge branch 'master' into tm_slice_index_lyrh 2019-03-25 19:02:35 +01:00
tamasmeszaros
d73d9309f1 Refactoring and commenting slice index solution. 2019-03-25 19:02:05 +01:00
Sijmen Schoon
1ed7895f61 Merge branch 'master' into fix-assertions 2019-03-25 17:24:04 +01:00
Enrico Turri
3e0ec8098b Code cleanup 2019-03-25 14:13:20 +01:00
Enrico Turri
ead45c4fb2 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_multivolume_models 2019-03-25 14:12:40 +01:00
Enrico Turri
149551946c Fix of #1998 2019-03-25 12:07:43 +01:00
Enrico Turri
dd3ac4017a Yet another tweak to the logic for releasing mouse capture into GLToolbar::on_mouse() 2019-03-25 08:48:41 +01:00
Enrico Turri
03aeb0d386 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_multivolume_models 2019-03-25 08:32:05 +01:00
Lukas Matena
3f7f8f978e Fix of sla gizmo (it sometimes showed supports for hidden objects) 2019-03-24 13:35:09 +01:00
bubnikv
9652e8193a Fixed caching of profile selections at the plater. 2019-03-23 10:04:44 +01:00
bubnikv
4f585f1157 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
bubnikv
c623cbc4d7 Fix of Perl bindings 2019-03-22 23:10:11 +01:00
Sijmen Schoon
36778a1e0d Remove double call to GetFirstVisibleItem() 2019-03-22 23:08:13 +01:00
bubnikv
b2ef3ba291 Fixed the options override box at the side bar. 2019-03-22 23:00:23 +01:00
bubnikv
2fe27a29e0 Fixed the SLA layer preview. 2019-03-22 21:26:58 +01:00
Sijmen Schoon
40d3b66807 Fix assert errors on startup on Linux 2019-03-22 20:49:17 +01:00
bubnikv
8003dd4991 Merge remote-tracking branch 'origin/tm_slice_index' 2019-03-22 17:08:38 +01:00
bubnikv
2bfd3b7844 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
tamasmeszaros
f4b70e42d1 Merge branch 'master' into tm_slice_index 2019-03-22 15:48:57 +01:00
bubnikv
ae93569044 Call Config Wizard from the Printer combo box at both the plater 
and the parameter tab.
 2019-03-22 15:45:51 +01:00
tamasmeszaros
4ece50e3db Merge branch 'master' into tm_slice_index 2019-03-22 15:31:58 +01:00
tamasmeszaros
d165dbb498 Refactoring changes to the slice index. 2019-03-22 15:31:38 +01:00
Enrico Turri
6bf0cf9466 Another tweak to the logic for releasing mouse capture into GLToolbar::on_mouse() 2019-03-22 14:35:26 +01:00
Enrico Turri
db21c67f18 Changed logic for releasing mouse capture into GLToolbar::on_mouse() 2019-03-22 13:03:34 +01:00
bubnikv
f5516f24c4 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
Enrico Turri
bbb2a6d714 Fixed non-uniform scale of single volumes selection when made using the sidebar matrix fields 2019-03-22 11:51:10 +01:00
Lukas Matena
0848617fd3 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
Enrico Turri
a5fd9a34e8 Do not consider modifiers when centering an object after 3mf and amf import 2019-03-22 09:47:40 +01:00
tamasmeszaros
5e646562cd Fixes for the duplicated layer issues... 2019-03-21 18:01:41 +01:00
tamasmeszaros
0ffc0c3a84 Merge branch 'master' into tm_slice_index 2019-03-21 15:17:01 +01:00
tamasmeszaros
24a5dd4235 FIx for broken slice preview 2019-03-21 15:16:33 +01:00
bubnikv
562343cd2a Localization fix of the warning texts in the 3D scene. 
Improved anti-aliasing of the warning texts in the 3D scene
and the G-code legend. A ClearType rendering has been suppressed
by rendering of the text into a red channel only.
 2019-03-21 14:33:55 +01:00
tamasmeszaros
d4dde12d0d Slic3r compiles with the new slice index interface. 2019-03-21 12:25:33 +01:00
bubnikv
f9e3b935d3 Yet another fix. 2019-03-21 12:09:14 +01:00
bubnikv
f76880cd5e Fix and optimization of the previous commit. 2019-03-21 11:54:25 +01:00
bubnikv
213ff2852a We are getting mysterious crashes on Linux in gtk due to OpenGL context activation GH #1874 #1955. 
So we are applying a workaround here, just on linux.
 2019-03-21 11:44:39 +01:00
Enrico Turri
a8cf701520 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring 2019-03-21 11:05:19 +01:00
Enrico Turri
024efd963a Renamed private methods of Selection 2019-03-21 11:02:10 +01:00
bubnikv
8105fc33d5 Fixed a merge issue 2019-03-21 10:46:40 +01:00
bubnikv
d9d0eff0f1 Merge remote-tracking branch 'remotes/origin/ys_comboboxes' 2019-03-21 10:11:27 +01:00
bubnikv
a5b27a7540 Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-03-21 10:07:42 +01:00
YuSanka
0198e71789 Implemented issue #1990 2019-03-21 09:37:52 +01:00
YuSanka
452eb62f11 Some code refactoring 2019-03-20 16:22:01 +01:00
Enrico Turri
3a923b7121 Fixed conflicts after merge with master 2019-03-20 16:09:14 +01:00
Lukas Matena
8b73608e9f SLA gizmo can be activated if the supports are outside the bed 
Otherwise there is a possibility that the object gets out of bed when the gizmo is active (supports are generated with object close to the edge), which the gizmo does not expect
 2019-03-20 15:37:13 +01:00
Enrico Turri
42c5d624cb Fix into GLToolbar::on_mouse() 2019-03-20 15:30:03 +01:00
Enrico Turri
83b24eee5b Added missing include 2019-03-20 14:36:36 +01:00
Enrico Turri
9a2d7c881b Fixed typo 2019-03-20 14:14:21 +01:00
Lukas Matena
8466c55b78 SLA gizmo - points are added on leftdown event, not leftup as before 2019-03-20 14:04:59 +01:00
Lukas Matena
df01af975a SLA gizmo now forces objects to use their normal color (not SELECTED_COLOR) 2019-03-20 14:04:20 +01:00
Enrico Turri
d23824af97 GLCanvas3D::Gizmos as a standalone class (GLGizmosManager) 2019-03-20 13:51:25 +01:00
Lukas Matena
2728e45646 Renamed function mouse_event to gizmo_event 2019-03-20 13:44:34 +01:00
YuSanka
e2349bdd2e Added workaround for the non-editable wxBitmapComboBoxs under OSXDisableAllSmartSubstitutions 
+ experiments with Linux
 2019-03-20 12:04:18 +01:00
tamasmeszaros
2f244895d2 Small fix for cancel button text on Linux 2019-03-20 11:12:37 +01:00
bubnikv
001d0c0fe9 Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-03-20 10:34:10 +01:00
YuSanka
b36e4fa512 Merge remote-tracking branch 'origin/ys_preset_edit_buttons' into ys_comboboxes 2019-03-20 10:33:50 +01:00
YuSanka
438010f0f8 Some code refactoring 2019-03-20 10:14:49 +01:00
Lukas Matena
4ceba39d99 Decreased number of polygons on the SLA support point marks for faster rendering 2019-03-20 10:13:16 +01:00
Enrico Turri
df250039df Tech ENABLE_CANVAS_GUI_REFACTORING set as default 2019-03-20 09:33:30 +01:00
bubnikv
4d37c8658d Merge remote-tracking branch 'remotes/origin/ys_preset_edit_buttons' 2019-03-19 17:37:02 +01:00
Enrico Turri
3b31976b09 Another fix for Linuz and Mac builds 2019-03-19 15:58:18 +01:00
Enrico Turri
b57f6c9fe0 Fixed build on Linux and Mac 2019-03-19 15:33:09 +01:00
YuSanka
b7a1bd927a Some improvements 2019-03-19 14:36:32 +01:00
Enrico Turri
80c1a8d8e4 GLCanvas3D::Selection as a standalone class 2019-03-19 13:30:21 +01:00
tamasmeszaros
630d266c4b Merge branch 'master' into tm_sla_png_minz 2019-03-19 13:19:17 +01:00
bubnikv
3617284385 Merge remote-tracking branch 'origin/ys_preset_edit_buttons' 2019-03-19 11:54:03 +01:00
bubnikv
b50c4cbaa3 Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-03-19 11:53:38 +01:00
Enrico Turri
ca623b9a83 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring 2019-03-19 10:59:16 +01:00
Enrico Turri
731e5a36b7 Commit 4a8a1fac7b re-made as linux-only 2019-03-19 10:54:54 +01:00
Enrico Turri
5bb89f4da2 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring 2019-03-19 10:48:51 +01:00
Enrico Turri
6eafc97302 Alternate fix of #1976 2019-03-19 10:48:20 +01:00
Enrico Turri
262f187699 Fixed visual hints for position in case of single volume selection 2019-03-19 10:09:54 +01:00
Enrico Turri
c4433bdf21 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring 2019-03-19 10:04:37 +01:00
Enrico Turri
334b5a82a6 Tech ENABLE_MOVE_MIN_THRESHOLD set as default 2019-03-19 10:04:19 +01:00
YuSanka
bdaadcccd9 Implemented SPE-874 
(Delete items from context menu for Simple mode)
 2019-03-19 09:53:47 +01:00
Enrico Turri
42939e76a3 Code cleanup 2019-03-19 09:21:27 +01:00
YuSanka
8be8b604f5 Merge remote-tracking branch 'origin/vb_faster_tabs' into ys_comboboxes 2019-03-19 08:52:58 +01:00
Enrico Turri
c0a2360c46 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring 2019-03-19 08:25:50 +01:00
bubnikv
20be57dc58 Weird things happen as the Paint messages are floating around the windows being destructed. 
Avoid the Paint messages by hiding the main window.
Also the application closes much faster without these unnecessary screen refreshes.
In addition, there were some crashes due to the Paint events sent to already destructed windows.
 2019-03-18 23:22:38 +01:00
bubnikv
2fab555daf Merge remote-tracking branch 'remotes/origin/master' into vb_faster_tabs 2019-03-18 20:54:28 +01:00
bubnikv
a90d5c8a28 Performance fix of rendering of the parameter tabs on Windows: 
Disabled Windows Vista themes for the wxNotebook.
 2019-03-18 20:54:01 +01:00
tamasmeszaros
24145cc14f Merge branch 'tm_miniz_zipper' into tm_sla_png_minz 2019-03-18 17:48:05 +01:00
Vojtech Kral
456d09be76 Fix out of bounds selection in ObjectList, fix #1890 2019-03-18 16:19:19 +01:00
Enrico Turri
4a8a1fac7b Fix of #1976 2019-03-18 16:00:44 +01:00
YuSanka
ba54ce0309 Added "Edit Preset" buttons on the sidebar. 
+ fixed Filament presets updating for the multi-material Printer (inside update_compatible(...) function)
 2019-03-18 15:10:40 +01:00
Enrico Turri
f249155340 Follow-up of a5b202aa1d (fixed cleanup of toolpaths in preview after scene update) 2019-03-18 14:07:55 +01:00
Enrico Turri
08ca5f1138 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring 2019-03-18 13:06:19 +01:00
Enrico Turri
de65d369a4 Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-03-18 13:00:18 +01:00
Enrico Turri
a5b202aa1d Fix of #1955 and #1874 2019-03-18 12:59:52 +01:00
bubnikv
b5894d334c Merge remote-tracking branch 'remotes/origin/master' into vb_faster_tabs 2019-03-18 12:51:57 +01:00
bubnikv
e278550cee Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-03-18 12:51:18 +01:00
bubnikv
cf53604ae8 Moved the Fileds from the Page object to the respective OptionGroups 
for performance reasons. Disabled clearing of background for most
of the static texts and Fields stored into OptionGrops.
 2019-03-18 12:49:57 +01:00
bubnikv
2f9e6cf887 Moved the Fileds from the Page object to the respective OptionGroups 
for performance reasons. Disabled clearing of background for most
of the static texts and Fields stored into OptionGrops.
 2019-03-18 12:48:39 +01:00
Enrico Turri
96fb6dff29 Fixed GLVolume::get_volume_scaling_factor() declaration 2019-03-18 12:37:14 +01:00
Enrico Turri
8b85e09062 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring 2019-03-18 12:07:32 +01:00
Lukas Matena
e813a562a1 Removed technology ENABLE_IMGUI 2019-03-18 11:45:15 +01:00
Lukas Matena
d3c8e3166e Separated gizmos into individual files 2019-03-18 11:45:15 +01:00
Enrico Turri
e97dcbb660 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring 2019-03-18 11:08:02 +01:00
Enrico Turri
feb2041c7b Context menu in 3D scene shown on right mouse up event 2019-03-18 10:47:01 +01:00
YuSanka
fe91edc521 Set MinSize() in respect to em_unit 2019-03-18 10:38:21 +01:00
Enrico Turri
710bb66dfc Fixed assert in imgui when starting Slic3r for the 1st time (no config data saved on disk) 2019-03-18 10:10:11 +01:00
Enrico Turri
131193a682 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring 2019-03-18 08:23:05 +01:00
bubnikv
f5b30237ea Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-03-17 09:33:11 +01:00
bubnikv
9eea1561b3 fix of problems with Cyrillic in the snapshot (if the name of the Russian letters) #1956 2019-03-17 09:32:53 +01:00
YuSanka
e74bde858a Deleted imaginary optimization for the Preset comboboxes on sidebar. 2019-03-16 22:23:51 +01:00
bubnikv
954d571ab0 Bumped up version number to 1.42.0-beta 
changed the config path from Slic3rPE-alpha to Slic3rPE-beta
 2019-03-16 17:12:51 +01:00
Lukas Matena
5f81328aa4 Fixed a case when the SLA gizmo did not calculate igl mesh and aabb tree even though it should 2019-03-15 18:40:49 +01:00