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

2009 Commits

Author SHA1 Message Date
Enrico Turri
a0640d2d24 Rectangle selection in 3D scene -> selection update 2019-04-25 12:31:55 +02:00
Enrico Turri
16ef4731e7 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_selection_rectangle 2019-04-25 11:51:23 +02:00
Enrico Turri
3fba850793 Rectangle selection in 3D scene -> tweaks to the hovering detection logic 2019-04-25 11:50:30 +02:00
Enrico Turri
d2597482e0 Added imgui debug dialog for render statistics 2019-04-25 11:10:01 +02:00
Vojtech Kral
3f978f6afe ConfigWizard: Fix app name interpolation 2019-04-25 10:47:15 +02:00
Enrico Turri
d2d06c9f73 Rectangle selection in 3D scene -> refactored GLVolume member varialbe for hovering 2019-04-25 10:21:24 +02:00
Enrico Turri
11490dfb06 Rectangle selection in 3D scene -> hovering detection 2019-04-25 09:46:26 +02:00
bubnikv
f78c3a0f1b WIP, non-uniform scaling in the world coordinate system: 
Disable non-uniform scaling when switching to the World coordinate system
and the rotation is not multiples of ninety degrees.
Ask user whether to bake in the transformations into the meshes if
enabling the non-uniform scaling in that case.
 2019-04-25 09:24:33 +02:00
Enrico Turri
ec2f319a3d Rectangle selection in 3D scene -> rendering 2019-04-25 09:10:03 +02:00
Enrico Turri
b557336fa6 Fixed conflicts after merge with master 2019-04-25 08:12:48 +02:00
YuSanka
b39e9a81f3 Merge remote-tracking branch 'origin/master' into ys_ftn_improvements 2019-04-25 08:12:19 +02:00
YuSanka
065448e9e5 Big Refactoring: - deleted/renamed all _Prusa_ prefixes, 
- cleaned code from commented parts
 - rescale() -> msw_rescale()
 2019-04-25 01:45:00 +02:00
YuSanka
be60f0a53c Merge remote-tracking branch 'origin/ys_msw_dpi' 2019-04-24 23:09:50 +02:00
YuSanka
b856645f3e Merge remote-tracking branch 'origin/ys_bug_fixing' 2019-04-24 22:55:24 +02:00
bubnikv
2cc7b00a7d WIP: World / local transformations of an object instance from the side panel. 2019-04-24 19:03:05 +02:00
Enrico Turri
8b77a4c717 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_selection_rectangle 2019-04-24 16:08:08 +02:00
YuSanka
b4d5287d0c Refactoring: get_mesh_errors_count() moved to ModelObject 
+ added get_object_stl_stats() to ModelObject
 2019-04-24 16:04:47 +02:00
Vojtech Kral
98c8cef657 ConfigWizard: Don't blow up if a printer bitmap is missing 2019-04-24 16:03:32 +02:00
Vojtech Kral
cfa7802a8a ConfigWizard: Attempt to fix width hint 2019-04-24 16:03:32 +02:00
Vojtech Kral
5fd2e573a0 GUI_App: Add a language code getter 2019-04-24 16:03:32 +02:00
Enrico Turri
9d070410c2 Refactoring of GLSelectionRectangle 2019-04-24 16:01:27 +02:00
Enrico Turri
d79a2b8d2d GLCanvas3D -> added support for cursor change and change cursor when using SLA support gizmo rectangle selection 2019-04-24 15:43:52 +02:00
Enrico Turri
9710140948 int GLCanvas3D::m_hover_volume_id replaced with std::vector<int> GLCanvas3D::m_hover_volume_idxs 2019-04-24 15:07:28 +02:00
Enrico Turri
fc67f44bea Fixed typo 2019-04-24 13:43:39 +02:00
YuSanka
356e1207d6 Merge remote-tracking branch 'origin/master' into ys_ftn_improvements 2019-04-24 13:38:07 +02:00
YuSanka
203e9e848c Changed Manipulation panel. (Simple mode)There is exclamation mark icon next for the object name, if it has errors. 
+ some code refactoring
 2019-04-24 13:33:05 +02:00
Lukas Matena
ae692635da Selection rectangle moved into a separate class 2019-04-24 13:25:41 +02:00
bubnikv
5d2537af35 WIP: Transformations of an instance in world coordinate system 
from the side panel.
 2019-04-24 11:01:59 +02:00
Lukas Matena
7185125f9c Fixed out-of-bouds access in RammingChart.cpp in case the ramming was turned off 2019-04-24 10:12:23 +02:00
YuSanka
aa147482b7 Added _fiction_ resizing for correct MainFrame rendering after DPI changed_object 
+ Added a calculation of a empty bitmaps inside presets in respect to em_unit (to avoid assert)
 + Added scaling for PrintHostDialogs and MsgDialog
 + some code refactoring
 2019-04-23 16:33:06 +02:00
Vojtech Bubnik
31d377d09f Some refactoring and documentation, modified Windows dependencies to compile against patched wxWidgets 2019-04-23 12:35:26 +02:00
YuSanka
31c02b6bfb Added missing includes 2019-04-23 08:47:23 +02:00
YuSanka
1f02eb704a Code refactoring: Deleted unused variables and _cleaned_ overbusy functions 2019-04-22 01:51:10 +02:00
YuSanka
ff3f1c9ee0 Fixed application crash, if try to change Preset in a moment, when one of unregular pages is selected. 
+ small code refactoring
 2019-04-22 00:46:58 +02:00
YuSanka
4a20fd7f7e Fix of #1216 2019-04-21 23:12:39 +02:00
YuSanka
144b9e1e9d Merge remote-tracking branch 'origin/master' into ys_bug_fixing 2019-04-21 11:37:30 +02:00
bubnikv
5e45cff855 Merge branch 'ys_msw_dpi' of https://github.com/prusa3d/Slic3r into ys_msw_dpi 2019-04-18 17:16:42 +02:00
bubnikv
e7d6586220 Another missing include 2019-04-18 17:16:31 +02:00
Lukas Matena
55c07394e5 Added dialog with shortcuts to the SLA gizmo, tried to improve the dialog look 2019-04-18 15:46:35 +02:00
YuSanka
b5533017fb Merge branch 'ys_msw_dpi' of https://github.com/prusa3d/Slic3r into ys_msw_dpi 2019-04-18 15:36:48 +02:00
YuSanka
5761c8f126 Merge remote-tracking branch 'origin/master' into ys_msw_dpi 2019-04-18 15:33:50 +02:00
YuSanka
de55801e31 Merge remote-tracking branch 'origin/ys_bug_fixing' into ys_msw_dpi 2019-04-18 15:24:50 +02:00
bubnikv
08b01338a8 Fixed missing header (clang is picky) 2019-04-18 15:22:58 +02:00
YuSanka
9cd3c594be Overrided on_dpi_changed() for some Dialogs: 
AboutDialog, ConfigSnapshotDialog, FirmwareDialog, SysInfoDialog

+ set correct fonts for KBShortcutsDialog
 2019-04-18 15:05:17 +02:00
YuSanka
e97e8c6af6 Overrided on_dpi_changed() for some Dialogs: 
BedShapeDialog, KBShortcutsDialog, ConfigWizard, Preferences
 2019-04-18 02:03:40 +02:00
YuSanka
077321b228 Implemented em_unit() function for getting of em_unit value from correct parent. 
+ Added correct em_unit to Fields
 2019-04-17 21:35:53 +02:00
Vojtech Kral
eae6576162 Fix default bitmap loading in Field 2019-04-17 17:31:00 +02:00
Vojtech Kral
79e71cb8d3 ConfigWizard: Fix index width 2019-04-17 16:48:01 +02:00
Vojtech Kral
b57452d090 Fix a bunch of race conditions between arrange and bg processing, fix #1770 2019-04-17 15:40:58 +02:00
Lukas Matena
0c1e223414 SLA gizmo clipping plane is now not necessarily perpendicular to camera direction 2019-04-17 14:27:20 +02:00
Lukas Matena
8df2a19974 SLA clipping plane can now be controlled by Ctrl + mouse wheel rotation 2019-04-17 14:27:20 +02:00
Vojtech Kral
00ed0de815 Fix a format string in UpdateDialogs.cpp 2019-04-17 14:26:07 +02:00
YuSanka
3e9c0c396e Code refactoring 2019-04-17 12:49:10 +02:00
Enrico Turri
50516e3b7d Attempt to fix Ctrl+C from 3D scene on Mac 2019-04-17 10:27:33 +02:00
Lukas Matena
19759b4315 SLA gizmo clipping - changed color on the cuts of supports, turned their rendering in editing mode (when the supports are not shown) 2019-04-17 09:39:51 +02:00
YuSanka
3b9803ba6e Fixed crash of build under OSX and Linux. 
+ Added flag to control if application rescale is possible
 2019-04-16 17:06:28 +02:00
YuSanka
850eb86360 Merge remote-tracking branch 'origin/master' into ys_bug_fixing 2019-04-16 15:27:10 +02:00
Enrico Turri
25bfebfe8e Fixed typo in shortcuts dialog 2019-04-16 13:53:57 +02:00
Enrico Turri
dfa924e8eb Ctrl+C and Ctrl+V for Copy and Paste refactored in the same way as Ctrl+A for Select All 2019-04-16 13:47:37 +02:00
YuSanka
fc63a28481 Application Scaling for MSW: 
+ Experiments with toolBars scaling
+ Rescaled warning and printing legends
 2019-04-16 12:13:45 +02:00
Vojtech Kral
554176b97f Http: Fix redirecting of post requests, fix #2018 2019-04-16 12:09:51 +02:00
YuSanka
ae2c61160f Application Scaling for MSW: Added rescale function for DoubleSlider (from Preview), ObjectList, ManipulationPanel and SettingsPanel 
+ Set wider default size for Preset Comboboxes from Tabs (#2023)
 2019-04-16 10:05:45 +02:00
Lukas Matena
63ce3c3150 SLA gizmo now does not make redundant copies of the object and supports meshes 2019-04-16 09:04:04 +02:00
Lukas Matena
f33e9bf609 TriangleMeshSlicer is now initialized by const-pointer to the mesh, responsibility for calling require_shared_vertices is left to the caller 2019-04-16 09:04:04 +02:00
Lukas Matena
a177a7e1da SLA gizmo clipping now also triangulates the cuts on support structure 2019-04-16 09:04:04 +02:00
Enrico Turri
e8c08d8f91 Switch to regular shading when manipulating an object with gizmos while layers editing is active 2019-04-16 08:50:46 +02:00
bubnikv
95a0adbac9 More unification of the application naming. 2019-04-15 19:49:37 +02:00
bubnikv
496922036f Harmonized the application naming. 2019-04-15 16:14:19 +02:00
Enrico Turri
8235ad2b02 ObjectList::paste_objects_into_list() refactored to call front end / back end synchronization and scene refresh only once 2019-04-15 15:40:40 +02:00
Enrico Turri
d8f28bc31a Follow-up of 1fbdf7bdaa -> Fixed grabbers size for move gizmo and grabbers dragging size 2019-04-15 15:05:26 +02:00
Enrico Turri
00a7673a2b Fixed glitches in rendering when activating layers editing 2019-04-15 14:19:18 +02:00
Enrico Turri
dddea0db22 Fixed selection when right-clicking in the 3D scene to show the context menu 2019-04-15 10:27:40 +02:00
Enrico Turri
07d1d44d8c Switch to Advanced mode if object or volumes imported from 3mf and amf files contain advanced config data 2019-04-15 09:22:11 +02:00
YuSanka
e502b33f41 Post-merge fix 2019-04-14 13:57:15 +02:00
YuSanka
df7ada0199 Merge remote-tracking branch 'origin/master' into ys_msw_dpi 2019-04-14 13:49:22 +02:00
YuSanka
66fa280964 Some code refactoring 2019-04-14 10:57:03 +02:00
bubnikv
e4162bbee9 When loading a 3MF with advanced data, switch to an Advanced mode, not 
Export moe.
 2019-04-14 08:26:10 +02:00
YuSanka
f7ddddcff5 Application Scaling for MSW: Next big step 
- Added rescale() function for the most of controls
 - Created PrusaBitmap and PrusaButton classes like a wrap to wxBitmap and wxButton accordingly
 2019-04-13 23:46:52 +02:00
bubnikv
255a4e05dc Fix of "Repir from File menu doesn't save the file #2064" 
The file was saved, albeit using an "obj" format, but into a file
with an ".stl" extension.
The software was fixed to propose a file to save with a correct ".obj"
extension.
 2019-04-13 14:45:35 +02:00
bubnikv
1e455bc065 Fix of "Variable layer height feature breaks after rotating part #2073" 
There was an approximate bounding box used at the GUI, while a snug
bounding box was used at the back end, causing invalidation
of the variable layer height editing profile on rotated objects.

A snug bounding box around the first instance is now cached.
 2019-04-13 14:15:54 +02:00
bubnikv
b0c33a1fe9 Fixed copying of some object's attributes into the clipboard 
(layer height profile, layer height table etc)
Added public Plater::schedule_background_process()
 2019-04-12 18:29:47 +02:00
YuSanka
cfa4f3f4d6 Added new icons 2019-04-12 17:10:29 +02:00
bubnikv
80afb6da78 Fixed SLA clippling plane & picking. 2019-04-12 16:08:40 +02:00
Enrico Turri
7d15ee8fd9 Offset used to place newly added volumes and instances proportional to the bed max size 2019-04-12 15:31:33 +02:00
Enrico Turri
c8b467bf9f Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-04-12 14:30:38 +02:00
Enrico Turri
e1debd3a4c Added icons for 3D and preview menu items 2019-04-12 14:30:28 +02:00
Lukas Matena
4abcf7bec4 SLA gizmo dialog height increased so the new clipping plane slider fits 2019-04-12 14:25:41 +02:00
Enrico Turri
e0545852f5 Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-04-12 13:03:08 +02:00
bubnikv
cef2fa3505 Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-04-12 12:58:00 +02:00
bubnikv
33ef1173a7 Moved the GLEW dependencies from libslic3r to the gui slic3r library. 2019-04-12 12:57:45 +02:00
Enrico Turri
c5fa804c33 Merge branch 'et_copy_and_paste' of https://github.com/prusa3d/Slic3r 2019-04-12 12:40:25 +02:00
YuSanka
3a412a3a82 Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-04-12 12:28:36 +02:00
YuSanka
50f8f45e0a Added new icons 2019-04-12 12:15:56 +02:00
Enrico Turri
edab2a056e Added icons for Edit menu items: Delete selected, Delete all, Copy, Paste 2019-04-12 11:50:14 +02:00
Enrico Turri
341e5276db Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_copy_and_paste 2019-04-12 11:28:43 +02:00
Enrico Turri
defcd26b4a Copy and paste -> Fixed paste for multivolumes copies 2019-04-12 11:28:24 +02:00
Vojtech Kral
5522ed9574 Also revert high DPI bitmaps in ObjectList for now 2019-04-12 11:28:07 +02:00
Vojtech Kral
2fe63e0b04 Revert high DPI bitmaps in Preset and PresetBundle for now 
due to bugs in wxBitmapComboBox et al.
 2019-04-12 11:04:42 +02:00
Enrico Turri
5a1b9cd382 Copy and paste -> Fixed tooltips for copy and paste toolbar items on Mac 2019-04-12 08:57:53 +02:00
Enrico Turri
6ff12111a6 Copy and paste -> Disabled paste of instances when selection is in Volume mode 2019-04-12 08:49:24 +02:00
Enrico Turri
3e902ecfbd Fixed conflicts after merge with master 2019-04-12 08:41:59 +02:00
tamasmeszaros
59758fea55 Material correction XY merged 2019-04-11 17:07:41 +02:00
bubnikv
112f218c03 Merge branch 'lm_sla_gizmo_clipping_plane' 2019-04-11 15:45:49 +02:00
bubnikv
4a210aeecf Vojtech's improvements in the SLA preview cutting dialog. 2019-04-11 15:44:32 +02:00
Enrico Turri
4046d517c9 Copy and paste -> Disabled paste of volumes when nothing is selected and fixed enabling/disabling of paste item in toolbar and edit menu 2019-04-11 14:21:08 +02:00
Enrico Turri
4718c839f6 Copy and paste -> Added items for copy and paste on the toolbar 2019-04-11 13:20:34 +02:00
Enrico Turri
bd2ac8f1f8 Copy and paste -> Added offset to pasted objects/volumes 2019-04-11 11:27:15 +02:00
Enrico Turri
99993170eb Copy and paste -> Fixed copy of multiple instances and volumes insertion into objects list 2019-04-11 11:09:32 +02:00
Enrico Turri
4987e5a7d5 Render selected objects first 2019-04-11 08:36:00 +02:00
Enrico Turri
b98659a749 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_copy_and_paste 2019-04-10 15:55:52 +02:00
Enrico Turri
8b9568797a Copy and paste -> prototype of copy and paste for objects 2019-04-10 15:55:32 +02:00
Lukas Matena
096d23f971 SLA gizmo fix: Discarding manual edits on autogenerated points removed all the points from the gizmo cache 2019-04-10 15:27:44 +02:00
Enrico Turri
1b6bf30e76 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_copy_and_paste 2019-04-10 14:03:57 +02:00
Enrico Turri
7a1fab09d4 Copy and paste -> Clipboard refactored to accept more than one object 2019-04-10 14:03:40 +02:00
Enrico Turri
2dc88ab0be Fixed crash when typing on keyboard during the app start-up 2019-04-10 13:52:18 +02:00
Lukas Matena
678c513cb9 Merge branch 'master' into lm_sla_gizmo_clipping_plane 2019-04-10 13:43:02 +02:00
bubnikv
9fd8461592 Changed the scene update on RELOAD_SLA_SUPPORT_POINTS 
to delay the loading if some transformation gizmo is in action.
 2019-04-10 13:36:15 +02:00
Lukas Matena
e6439ad010 SLA gizmo fix: recalculation of the mesh was sometimes skipped 2019-04-10 13:33:58 +02:00
Enrico Turri
a80978f84a Do not show as hovered the entire instance when hovering on modifiers 2019-04-10 12:20:07 +02:00
Enrico Turri
43b51c338e Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_copy_and_paste 2019-04-10 12:17:13 +02:00
Enrico Turri
356637a627 Do not activate Delete command when the wipe tower is selected 2019-04-10 12:16:17 +02:00
Enrico Turri
6043dbd07d Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_copy_and_paste 2019-04-10 11:20:28 +02:00
Enrico Turri
e61be7d260 Render picking pass renders volumes in the same order as the regular render pass 2019-04-10 11:20:09 +02:00
bubnikv
f4c8f91519 Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-04-10 10:16:12 +02:00
bubnikv
7b8b8b97ef Fixed Cmd-A selection in the SLA gizmo. 2019-04-10 10:16:04 +02:00
YuSanka
a74c608c7a Merge remote-tracking branch 'origin/master' into ys_msw_dpi 2019-04-10 10:01:20 +02:00
YuSanka
82573390c7 First scaling experiments 2019-04-10 09:57:33 +02:00
Enrico Turri
50fc406fe2 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_copy_and_paste 2019-04-10 09:46:24 +02:00
YuSanka
7b54c59b61 Added new icons 2019-04-10 09:41:04 +02:00
Enrico Turri
6f6b78d661 Copy and paste -> Copy a volume from an object and paste to another 2019-04-10 09:27:42 +02:00
Enrico Turri
6cbf9d2523 1st installment of copy and paste -> prototype for volumes copy and paste 2019-04-10 08:40:58 +02:00
tamasmeszaros
53861b2012 Removing separate X and Y relative correction. 2019-04-09 18:15:25 +02:00
Vojtech Kral
81f4ce5f2e Bitmaps: Pass wxWindow context in a few more places 2019-04-09 18:01:45 +02:00
Vojtech Kral
d399ebacc9 Bitmaps: Fix: Use scaling factor on Mac only 2019-04-09 18:01:45 +02:00
bubnikv
d383f3591d Switching to the preview screen when the "Slice now" button is pressed. 
Let's wait for the response of the beta testers whether it is a good
idea.
 2019-04-09 17:15:14 +02:00
Enrico Turri
7aa6c1854f Follow-up to af05e5fc2c -> added missing #else 2019-04-09 15:43:16 +02:00
Enrico Turri
0889877e26 Tweaks to selection from 3D scene 2019-04-09 15:42:00 +02:00
Vojtech Kral
c17e8602ed Factor out load_scaled_bitmap 2019-04-09 15:16:10 +02:00
Vojtech Kral
64ce604ff4 GUI_App: Refactor exception handling 2019-04-09 15:16:10 +02:00
Vojtech Kral
2494dc6706 Fix SVG & bitmap scaling on Mac depending on Retina scaling 2019-04-09 15:16:10 +02:00
Vojtech Kral
d97037e246 GLCanvas3D: Fix an assert in _set_current() 2019-04-09 15:16:10 +02:00
tamasmeszaros
c702ddc65d Adding absolute correction (XY offset) and gamma correction parameters. 2019-04-09 13:42:32 +02:00
bubnikv
d8cb1b0792 Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-04-09 13:13:57 +02:00
bubnikv
6bd54f0112 Hopefully fixing the "scroll to the first selected line" issue 
at the object list.
 2019-04-09 13:13:42 +02:00
Enrico Turri
24b8c1fde3 Forced one frame render after selecting single volume in objects list 2019-04-09 11:38:56 +02:00
Enrico Turri
a13b2b1de3 Fixed crash when using mouse wheel before the 3D scene is shown (during app startup) 2019-04-09 11:18:40 +02:00
bubnikv
7c75081a31 Changed the hot key in the keyboard shortcuts dialog for plater 
Ctrl+Left mouse for selection.
 2019-04-09 10:46:32 +02:00
bubnikv
0c7e351eb7 Fix of SPE-896 "SLA preview is not invalidated when profile is changed" 2019-04-09 10:41:42 +02:00
bubnikv
1fffae4e0b A little refactoring of loading meshes in VBO / non VBO case. 2019-04-08 18:11:36 +02:00
bubnikv
4904359399 Finished SLA print / material correction visualization. 2019-04-08 18:09:31 +02:00
bubnikv
28d999bc04 Merge remote-tracking branch 'remotes/origin/master' into tm_relative_correction 2019-04-08 16:02:05 +02:00
Lukas Matena
f71e14a4d9 SLA gizmo now uses ctrl to add to selection and alt to remove from selection 2019-04-08 15:34:42 +02:00
bubnikv
0de084df8d Merge remote-tracking branch 'remotes/origin/master' into tm_relative_correction 2019-04-08 14:00:27 +02:00
bubnikv
fa890c2bbc Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-04-08 13:35:22 +02:00
bubnikv
ca6a5af1dc Fixed rotation of SLA instances in case a rotation in X or Y was applied 
to the instances.
 2019-04-08 13:35:03 +02:00
YuSanka
e0340f4f81 Set "cog" ison for sla_print preset 2019-04-08 12:29:08 +02:00
Lukas Matena
837bc43c9f SLA gizmo on_set_state code is now called through CallAfter to prevent repeated wxMessageDialog appearances (seen on OSX) 2019-04-08 11:56:13 +02:00
Vojtech Kral
7e32f2df71 Implement per-screen DPI on Windows, DPI change event, wxDialog & wxFrame mixin base classes 2019-04-08 11:34:46 +02:00
YuSanka
af05e5fc2c Fixed crash under oSX after selection with SHIFT from 3DScene 2019-04-08 11:10:57 +02:00
YuSanka
618d124bfb Icon updating for all application 2019-04-08 11:10:57 +02:00
Lukas Matena
eadf7daa37 Merge branch 'master' into lm_sla_gizmo_clipping_plane 2019-04-08 10:50:10 +02:00
Lukas Matena
09cf1b9b00 Allowed general object transformation and SLA z-shift (clipping plane) 2019-04-08 10:31:53 +02:00
Lukas Matena
7531f2d5e7 Selection rectangle now respects the clipping plane position 2019-04-08 10:31:22 +02:00
Lukas Matena
bbda1896f9 The gizmo is now able to triangulate and show the cut, the triangulated cut is cached 2019-04-08 10:31:19 +02:00
Lukas Matena
9b7857aaab SLA gizmo clipping plane logic moved to fragment shader 
This means the clipping now works again with both legacy and modern OpenGL
 2019-04-08 10:31:16 +02:00
Lukas Matena
273fcf68a1 SLA gizmo now uses glClipPlane instead of touching projection matrix 
Messing with the projection matrix invalidates the z-buffer
This currently only works in OpenGL legacy mode
 2019-04-08 10:31:13 +02:00
Lukas Matena
bc9164e40c SLA gizmo now respects the clipping plane when rendering points and raycasting mouse onto mesh 2019-04-08 10:31:10 +02:00
Lukas Matena
fd1f9d65fb First steps on SLA clipping plane 2019-04-08 10:31:04 +02:00
Enrico Turri
09c7eb1d28 Follow-up of a7318dbe19 -> Do not disable other instances when an instance is selected 2019-04-08 09:49:21 +02:00
Enrico Turri
a688493d91 Merge branch 'et_canvas_gui_refactoring' of https://github.com/prusa3d/Slic3r 2019-04-08 09:09:12 +02:00
Enrico Turri
8cdc461d34 CTRL-click replace SHIFT-click for addind/removing objects to the current selection from the 3D scene 2019-04-08 08:30:28 +02:00
YuSanka
d31590f438 Fixed Typo for the last commit 2019-04-05 12:18:58 +02:00
Enrico Turri
6ca49c05df Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring 2019-04-05 11:55:56 +02:00
Enrico Turri
233eda2813 Export to stl of instances 2019-04-05 11:30:49 +02:00
YuSanka
0c662e298f Merge remote-tracking branch 'origin/ys_selection' 2019-04-05 11:25:29 +02:00
YuSanka
ef5281c3c9 Some improvements for a loading of icons 2019-04-05 11:18:59 +02:00
Enrico Turri
a9223aeb5f Follow-up of 763a91e2ca -> take in account of ModelObject::origin_translation when saving parts and modifiers to stl 2019-04-05 10:08:34 +02:00
Lukas Matena
177f5b02fa Disabled layer editing mode for SLA 2019-04-05 09:51:58 +02:00
YuSanka
77dcb7f5a3 Added missed code for my last commit 2019-04-05 09:04:52 +02:00
YuSanka
ccee04cd68 Implemented new logic for Instances splitting 2019-04-04 18:03:40 +02:00
YuSanka
8631cb006b Improved Selection from ObjectList side 2019-04-04 18:03:40 +02:00
tamasmeszaros
b56991d780 Fix for leaving the object outside bed after "optimize orientation" 2019-04-04 16:03:23 +02:00
Enrico Turri
763a91e2ca Export to stl of parts and modifiers 2019-04-04 15:13:43 +02:00
YuSanka
63dea6d5dc Merge remote-tracking branch 'origin/master' into ys_selection 2019-04-04 15:09:37 +02:00
YuSanka
09054a0bc9 Fixed non-consistency of the selection 2019-04-04 15:07:54 +02:00
Enrico Turri
24128e01ed Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-04-04 14:00:48 +02:00
Enrico Turri
6197f48321 Use current selection to determine proposed filename when exporting to stl files 2019-04-04 14:00:31 +02:00
Vojtech Kral
70ce79c86e SLA export: Finalize filename when exporting & uploading, 
set correct project name when uploading
 2019-04-04 13:10:11 +02:00
Vojtech Kral
251747e6fa GLGizmoCut: Scale input field 2019-04-04 12:31:13 +02:00
Enrico Turri
369cdd8b3b Ask user to switch to expert mode when loading a 3mf or an amf file containing instances or modifiers from simple mode 2019-04-04 12:02:13 +02:00
Enrico Turri
c7d6691658 Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-04-04 11:31:44 +02:00
Enrico Turri
30f44880d7 Removed 'Export print config' checkbox from save dialog for 3mf and amf files 2019-04-04 11:31:26 +02:00
bubnikv
39ce4c33a4 Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-04-04 09:41:23 +02:00
Enrico Turri
936f7a3b84 Select newly added parts/volumes from current selected instance when adding from 3D scene's context menu 2019-04-04 09:35:13 +02:00
bubnikv
a36bdefda5 Code to load SVG icons into the BitmapCache class. 2019-04-04 09:20:11 +02:00
Enrico Turri
6d9180ba92 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring 2019-04-04 09:03:25 +02:00
Enrico Turri
a7318dbe19 Keeps non selected instances as disabled for any combination of current instance's volumes selection 2019-04-04 09:01:47 +02:00
tamasmeszaros
c6b5fe05e4 Scaling correction parameters in material and print conf. 
Scaling is applied in sla_trafo but no effect unless set before model import.
 2019-04-03 17:34:46 +02:00
Vojtech Kral
703b9bda32 imgui: Fix scaling 2019-04-03 16:39:28 +02:00
Vojtech Kral
c99fe20504 imgui: Yet another font size fix 2019-04-03 16:31:49 +02:00
Enrico Turri
305b07978c Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-04-03 15:28:27 +02:00
Enrico Turri
28ec3415eb Keep instance mode selection when at least one instance is already selected 2019-04-03 15:28:09 +02:00
Lukas Matena
69027b53fd SLA gizmo now allows to deselect a point 2019-04-03 14:44:24 +02:00
Enrico Turri
7d488e3424 Added call to schedule_background_process() when deleting modifier attribute 2019-04-03 12:45:06 +02:00
bubnikv
527c213b57 Fixed cutting of objects in left oriented coordinate space. 
Removed some spurious debugging printf.
 2019-04-03 12:07:58 +02:00
Lukas Matena
2269e1b183 Deliberately setting the SLA dialog a bit too large 
It is not possible to precisely calculate actual window size before the rendering, so I added a safety margin.
It would be nicer to let the window autoscale and only use the inflated dimension for possible moving the window upward to prevent collision with the bottom panel, but...
ImGui autoscaling does not work properly for some reason (the window size autoscales only after a mouse move), so this is a workaround.
 2019-04-03 10:41:45 +02:00
Enrico Turri
eff8dd1ae5 Fixed negative values for size shown in the sidebar matrix fields when mirroring is applied 2019-04-03 09:05:52 +02:00
YuSanka
d806e8e5e1 Merge remote-tracking branch 'origin/master' into ys_selection 2019-04-03 08:42:12 +02:00
YuSanka
fed0f189d3 Fixed typo 2019-04-03 08:39:36 +02:00
Enrico Turri
48da4d4756 Fixed conflicts after merge with master 2019-04-03 08:38:32 +02:00
bubnikv
eeae1c0495 Fixed update of the SLAPrint back end after mirroring in a specific 
case of mirroring around the X axis.
Fixed some asserts on visual studio due to access to empty std::vector
 2019-04-02 18:04:23 +02:00
YuSanka
81809018bc Selection improvements 
+ "Delete" menu_item for Instances under OSX
 2019-04-02 16:33:52 +02:00
Vojtech Kral
1979baf619 imgui: Fix font size and scaling on Windows 2019-04-02 15:28:14 +02:00
Enrico Turri
89a0c84c83 Fixed conflicts after merge with master 2019-04-02 15:13:26 +02:00
Enrico Turri
ba4f0445c3 Fixed rendering of sla cap slices after deleting object 2019-04-02 14:43:38 +02:00
Enrico Turri
f147da1e5d Fixed conflicts after cherry-picking 5c89135 2019-04-02 14:32:12 +02:00
bubnikv
dc64b4d971 Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-04-02 13:54:46 +02:00
bubnikv
086f11df98 Handling of left hand oriented coordinate systems: 
is_left_handed() method on transformations and volumes
rendering of GLVolumes in left handed coordinate systems by glFrontFace(GL_CW);
SLA slicing on left hand oriented instances by flipping the mesh for SLAPrintObject in X.
rendering of the SLA cutting plane in left handed systems
resetting the SLA clipping planes on 3D preview invalidation
 2019-04-02 13:47:49 +02:00
Vojtech Kral
9d5eb2cd48 Fix build 2019-04-02 10:56:30 +02:00
Enrico Turri
adf9c4bd40 Follow-up of d4b22cfb87 -> Fixed dragging of sla instances after slicing 2019-04-02 10:55:36 +02:00
Vojtech Kral
c542413962 imgui: More refactoring, cut gizmo window positioning 2019-04-02 10:36:24 +02:00
Vojtech Kral
145b8fd0df Firmware updater: Improve logging 2019-04-02 10:33:37 +02:00
Vojtech Kral
75990923f7 Firmware updater: Support for CW1 2019-04-02 10:33:37 +02:00
Lukas Matena
e20ffbfd85 SLA gizmo uses CallAfter to trigger SLA supports calculation to prevent recursive rendering calls 2019-04-02 09:36:16 +02:00
Lukas Matena
5f66a2d181 SLA gizmo dialog now respects system font settings 2019-04-01 14:51:18 +02:00
Vojtech Kral
88cc93cdc9 imgui: Refactor font size, font initialization 2019-04-01 14:28:39 +02:00
Enrico Turri
83aaa471cf Fixed conflicts after merge with master 2019-04-01 14:21:55 +02:00
Enrico Turri
d4b22cfb87 Fix dragging of mixed instances plus volumes selections 2019-04-01 13:53:48 +02:00
tamasmeszaros
50942e9382 Merge branch 'tm_reuse_unified' 2019-04-01 12:24:50 +02:00
Enrico Turri
7cfcf8fb9a Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring 2019-04-01 11:40:08 +02:00
bubnikv
62539bc35b Fix of No preview of position in variable layer editing UI at retina resolution #2050 2019-04-01 11:08:26 +02:00
Enrico Turri
2ae5f386ae Added missing include 2019-04-01 10:28:04 +02:00
Enrico Turri
d87b478d60 Camera refactoring 
1) All camera related OpenGL calls moved into class

2) The Camera class now stores the view matrix, the projection matrix and the viewport

3) The Camera class now exposes methods to get the camera orientation vectors, the camera position, the view matrix, the projection matrix and the viewport

4) All the code operating on the camera or requiring camera data has been modified to use the new methods
 2019-04-01 10:00:10 +02:00
Enrico Turri
ba89f04429 Fix of visual hints for rotation of full single instance selection 2019-04-01 09:11:23 +02:00
Enrico Turri
1ce3bb690c Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring 2019-04-01 08:28:38 +02:00
tamasmeszaros
725f115756 Merging with master for having minz png compression. 
Much greater performance boost from better compression algorithm than that from the merged polygons.
 2019-03-29 15:21:46 +01:00
Vojtech Kral
3cfb234e86 imgui: Get font size from wxWidgets, fix #2043 2019-03-29 14:58:32 +01:00
YuSanka
ac6a232795 Improved Selection from ObjectList side 2019-03-29 14:36:59 +01:00
Lukas Matena
32ed064797 SLA gizmo fix: occasional crashes after deleting objects 2019-03-29 13:38:33 +01:00
Enrico Turri
aca78cfba2 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring 2019-03-29 12:58:41 +01:00
Enrico Turri
49fe8a9f08 Volumes selected from the sidebar table taken from the currently selected instance 2019-03-29 10:48:20 +01:00
YuSanka
44d3243df1 Added context menu Item "Change Extruder" on 3D-Scene 2019-03-28 16:32:19 +01:00
YuSanka
016b5e35b6 Some _cosmetic_ fixes : 
+ Set wxDEFAULT_DIALOG_STYLE for MsgDialog
+ Changed Msg text before language changing
 2019-03-28 16:32:19 +01:00
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