Commit Graph

4442 Commits

Author SHA1 Message Date
Slic3rPE
5cb61dc789 missing includes 2020-02-03 10:13:15 +01:00
YuSanka
cb49940662 Added missed include under OSX 2020-02-03 09:24:58 +01:00
Enrico Turri
d344e3e2b4 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_labels 2020-02-03 08:23:55 +01:00
YuSanka
530c586277 ObjectDataViewModel is extracted from wxExtentions to the separated file
+ parse_color function is moved to BitmapCache from PresetBundle
2020-02-02 22:22:40 +01:00
YuSanka
1a6c8d786e Mark a tick as a conflict, if it has a ToolChange to the same extruder 2020-02-02 21:20:48 +01:00
YuSanka
737715c317 Fixed build under OSX 2020-02-02 19:40:00 +01:00
YuSanka
1278f0a93b Added missed include for OSX 2020-01-31 21:03:17 +01:00
YuSanka
82bb5be1f6 To fix blurred icons under OSX there is implemented PresetBitmapComboBox, derived from wxBitmapComboBox,
which now will be used for preset choosers on sidebar a preset tabs.

+ for BitmapCache class added m_scale used for correct scaling of SVG images on Retina displays

+ some code clearing from unused functions or function's parameters
2020-01-31 16:57:45 +01:00
Lukas Matena
9e0614f416 Fix of tripping glAssert after switching to Preview on Linux/GTK2
(fix suggested and thus approved by @enricoturri1966)
2020-01-31 14:50:37 +01:00
Enrico Turri
30c2e0145d #3580 - Added menu item 'Edit/Reload from disk' and F5 key acceleration to reload the entire plater 2020-01-31 12:15:04 +01:00
bubnikv
b4d20a1198 Implemented loading of hollowed SLA mesh into the scene
in place of the normal mesh.

WIP: The code is inefficient (it does not store the timestamp
of the hollowed mesh, therefore it refreshes the hollowed mesh on each
scene update) and if the hollowing gets invalidated, the original mesh
is currently not being reloaded and the hollowed mesh is still visible.
2020-01-30 17:58:49 +01:00
Lukas Matena
5ba0e67c35 Gizmo updates - forget everything about the loaded mesh when an object is deselected 2020-01-30 15:26:23 +01:00
YuSanka
4bb45f01cc Implemented DnD for objects inside ObjectList 2020-01-30 15:01:47 +01:00
Lukas Matena
021944dde7 SlaSupports gizmo - most of updating now assumes that common data struct is updated properly 2020-01-30 14:31:52 +01:00
Lukas Matena
80842be583 Hollowing gizmo - most of updating now assumes that common data struct is updated properly 2020-01-30 14:31:39 +01:00
Enrico Turri
084be76425 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_labels 2020-01-29 15:46:48 +01:00
Enrico Turri
0218baf66d Follow-up of 17a6b696e7 -> Fixed missing imgui window size initialization 2020-01-29 15:40:56 +01:00
Enrico Turri
0b5d0cfe38 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_labels 2020-01-29 14:46:09 +01:00
Enrico Turri
2f2fc2f17b Follow-up of 17a6b696e7 -> Fixed build when tech ENABLE_6DOF_CAMERA is disabled 2020-01-29 14:44:03 +01:00
Lukas Matena
0f62f0a010 Refuse to drill a broken mesh
Hole parameters defaults and limits changed a bit
2020-01-29 14:07:12 +01:00
Enrico Turri
b9562e8754 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_labels 2020-01-29 12:31:50 +01:00
Enrico Turri
61d4fe5c35 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-01-29 12:09:34 +01:00
Enrico Turri
763d0ee01a Workaround to fix SPE-1082 + refactoring of 6 dof camera 2020-01-29 12:08:38 +01:00
Lukas Matena
370255ac6a Fixed transformation of the hollowed mesh to be used at frontend
Common gizmos data update is called from GLGizmoManager
2020-01-29 10:08:26 +01:00
Lukas Matena
3155e844bb SLA gizmos can now fetch hollowed and drilled mesh from the backend 2020-01-29 10:08:26 +01:00
Lukas Matena
5da2825f6f REVERT LATER: TEMPORARILY MANGLED reload_scene FUNCTION
This commit horribly cripples reload_scene function just to update volumes in scene so that Hollowing and SLASupport gizmos can be updated to the new logic
    It should be later reverted and the same be achieved in a better way
2020-01-29 10:07:59 +01:00
YuSanka
b3982d2973 Typo fix for a38735b4ae 2020-01-28 16:40:31 +01:00
YuSanka
940c31df5f Typo fix for a38735b4ae 2020-01-28 16:23:55 +01:00
YuSanka
85b1b56eac More fix of svg icons scaling under OSX (to avoid icon's blurring)
+ some code cleaning from unused text
2020-01-28 16:17:51 +01:00
Enrico Turri
d4b957f86a Added extra frame renders to let labels grow to their final size 2020-01-28 15:57:02 +01:00
Enrico Turri
7930e60a97 1st installment of object/instance labels in 3D scene 2020-01-28 13:15:21 +01:00
Enrico Turri
f47231b0ef Another refactoring into class Camera 2020-01-28 09:13:54 +01:00
YuSanka
28c573709b Fixed an icon scaling in the ObjectList under OSX 2020-01-27 16:30:09 +01:00
YuSanka
ffc636e559 Fixed menu icons scaling under OSX 2020-01-27 14:58:11 +01:00
YuSanka
4d3a297874 Implemented upgrade_text_entry_dialog() fuction to avoid a getting an empty string from wxTextEntryDialog (disable OK button, if TextCtrl is empty)
All mode conflicting or meaningless ticks are marked by "exclamation" icon and described in tooltip.
2020-01-27 14:36:32 +01:00
tamasmeszaros
9b9791523e Remove some gtk warnings on application start. 2020-01-27 14:31:49 +01:00
Enrico Turri
e9009d025d Small refactoring into class Camera 2020-01-27 13:39:44 +01:00
bubnikv
6bf2a2a339 Forcing a print bed update after config or config bundle is loaded.
The solution is hackish, but a major refactoring would be needed
to avoid multiple refreshes of the print bed, and to avoid
expensive checks at Plater::on_config_change() every time
a config value changes at a parameter tab.
2020-01-24 15:16:36 +01:00
Enrico Turri
86a179535e Removed duplicate definition in Preset::sla_printer_options() 2020-01-24 12:59:26 +01:00
YuSanka
64019677a6 Updated tooltips for DoubleSlider
*partially related to #3543
2020-01-24 11:51:37 +01:00
Lukas Matena
957763a24b Hollowing gizmo can now trigger the backend calculation 2020-01-24 10:53:40 +01:00
tamasmeszaros
1bc1ba5a1b Use mesh boolean in the backend to drill holes. 2020-01-24 10:53:40 +01:00
tamasmeszaros
322092a2f8 Merge branch 'master' into lm_tm_hollowing 2020-01-23 17:43:18 +01:00
YuSanka
46739c0c47 Implemented editing for extruder of existing ToolChangeCode tick
+ Code refactoring: DoubleSlider is extracted from wxExtensions
2020-01-23 16:11:21 +01:00
YuSanka
eef74403bf Synchronized mode of color_print data to/from 3mf/amf
+ Code refactoring " CustomGCode extracted to separate namespace and file
2020-01-23 16:11:21 +01:00
bubnikv
01f8595225 Little optimization of the profile aliases. 2020-01-23 16:04:17 +01:00
bubnikv
1f712c0af5 Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer 2020-01-23 09:53:17 +01:00
bubnikv
ec31ef90e9 Refactored PrintObject::m_copies to PrintInstances,
so that the ordering code at G-code export may work directly with
pointers to PrintInstances instead of with pair of <PrintObject, copy idx>.
Also the PrintInstance knows its source ModelInstance, which allows
sorting of PrintInstances for sequential printing in the order
they appear in Plater's object list.
2020-01-23 09:53:06 +01:00
David Kocik
c6e5df06e3 adding constantness & removing unused code 2020-01-22 17:15:09 +01:00
YuSanka
b605b951aa DoubleSlider: Implemented code switch between ToolChangeCode and ColorChangeCode for MultiAsSingle mode 2020-01-22 15:01:59 +01:00