Commit Graph

1771 Commits

Author SHA1 Message Date
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
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
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