Lukas Matena
50ebdf5293
Include cleanup in Plater, GLCanvas3D and GLGizmosManager
2020-03-03 15:53:26 +01:00
Enrico Turri
d12cc6cb77
Removed temporary debug output
2020-03-03 08:34:03 +01:00
Enrico Turri
8b5a08a64a
Added temporary debug output
2020-03-02 15:22:41 +01:00
Enrico Turri
595128a90d
View toolbar's initialization of icon size moved from GLCanvas3D::GLCanvas3D() to Plater::priv::priv() for OSX build
2020-03-02 12:45:04 +01:00
Enrico Turri
10d2193645
Fixed build on MAC
2020-03-02 11:40:35 +01:00
Enrico Turri
2f8970de86
Fixed conflicts after merge with master
2020-03-02 11:35:03 +01:00
Enrico Turri
0b629eb905
GLCanvas3DManager moved from being a static member of _3DScene to be a normal member of GUI_App
2020-03-02 10:58:46 +01:00
bubnikv
0a0219961b
Free rotating camera reworked to rotate around the free rotation
...
axis in a single step.
2020-02-28 14:59:59 +01:00
bubnikv
7c55674220
Disabled implicit conversion of wxString to std::string or const char*
...
and vice versa. Fixed one last implicit wxString conversion.
2020-02-27 17:02:08 +01:00
Lukas Matena
f60c117761
One more encoding problem
...
Uncovered after rebasing onto current master
2020-02-21 12:53:51 +01:00
Benjamin Greiner
a877147afd
fix #3402
...
Amended by lukasmatena: changed mb_str() to ToUTF8()
2020-02-21 12:53:51 +01:00
YuSanka
487ac0423e
Implemented time estimation for PausePrint ( #3544 )
...
DoubleSlider: fixed get_color_for_color_change_tick()
2020-02-20 17:33:43 +01:00
Enrico Turri
4a59a45d51
ENABLE_SHOW_SCENE_LABELS set as default
2020-02-13 13:24:52 +01:00
Enrico Turri
847efec2ed
ENABLE_6DOF_CAMERA set as default
2020-02-13 12:13:54 +01:00
Enrico Turri
0f5f2bc519
Reintroduce rotation limits for camera for FDM printers
2020-02-10 12:36:52 +01:00
bubnikv
b8c898bf40
Fixed a bug in validation of the FDM Print to check for extruder
...
collisions against already printed objects: Rotation of an object
was not being taken into account.
Fixes #2450 PrusaSlicer 2.0 Sequential printing vs rotate object
Fixes #3585 Always Sequential Printing Error (Regardless of setting, placement or object size)
Fixed some collisions in sequential print just after arrangement by
making the validation using a slightly lower extruder radius value
than the arrangement.
Refactored PrintObject coordinate system so that the PrintObject's
coordinate system is always centered in respect to its ModelObject's
geometries. This refactoring may improve path planning a bit and
it may lower the requirements on bits representing Clipper coordinates
by 1 bit.
2020-02-07 14:10:27 +01:00
Enrico Turri
ef32cd6059
Fixed conflicts after merge with master
2020-02-06 15:28:50 +01:00
Enrico Turri
c6ca180142
Use frontend data to update labels
2020-02-06 15:19:53 +01:00
bubnikv
fb235cb675
Color change - handling Color Change data stored for different
...
printer configuration:
ss -> sm : Just apply the color changes of the original ss project at the active extruder.
ss -> mm : There are no tool changes stored. Ignore color changes, they are invalid because they are extruder non-specific.
sm -> ss : Apply tool changes as color changes (tool changes remember the target color), apply original color changes.
sm -> mm : Ignore both color changes and tool changes.
mm -> ss/sm : Ignore both color changes and tool changes.
2020-02-06 14:03:27 +01:00
Enrico Turri
3981e25f75
Fixed labels auto-sizing
2020-02-06 12:06:39 +01:00
Enrico Turri
bfea105c2e
Fixed mmissing #if ENABLE_SHOW_SCENE_LABELS
2020-02-06 10:39:42 +01:00
Enrico Turri
5c4b481e35
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_labels
2020-02-05 15:27:20 +01:00
Enrico Turri
a04c72b0c9
Fixed unneded auto-extra frame render
2020-02-05 15:27:11 +01:00
Enrico Turri
fce9f77472
Translations with arrow keys with modifiers:
...
Shift -> slower translations
Ctrl -> translations in camera space
2020-02-05 13:14:50 +01:00
Lukas Matena
617912ecc1
Fixed a crash on deleting object with SLA gizmo active
...
Rephrased text informing about hidden objects in both SLA gizmos
2020-02-04 15:03:10 +01:00
Lukas Matena
0e3ebb3e07
Hollowing gizmo: Invalidate drilled mesh in case a hole is manipulated
...
This way the holes cannot be placed on its own walls
Downside is that AABB trees have to be recalculated
2020-02-04 15:03:10 +01:00
Enrico Turri
3ec4b77dcd
Added item menu 'Edit/Show labels' and removed labels activation from preferences dialog
2020-02-04 14:42:26 +01:00
Enrico Turri
dc393e2f0a
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_labels
2020-02-04 12:28:06 +01:00
Enrico Turri
87daba9288
Movements and rotations by keyboard indipendent from gizmos:
...
Left arrow = Decrease X by 1mm
Right arrow = Increase X by 1mm
Up arrow = Decrease Y by 1mm
Down arrow = Increase Y by 1mm
PgUp = Rotate 45 degrees CCW
PgDown = Rotate 45 degrees CW
2020-02-04 11:42:58 +01:00
Lukas Matena
227cc4dc33
Fixed conflicts after merge
...
slaposHollowing was divided into slaposHollowing and slaposDrillHoles on master
This commit takes this into account on the code that was merged from lm_drilling_backend_rebased
2020-02-03 15:42:54 +01:00
Lukas Matena
a1d4dab999
Merge branch 'master' into lm_drilling_backend_rebased
2020-02-03 15:20:16 +01:00
bubnikv
f28d0ebc18
Implemented reload of original mesh volume in case the SLA hollowing
...
step is no more valid.
2020-02-03 15:17:18 +01:00
Enrico Turri
1ee2f16a71
3D scene labels transparent to mouse click
2020-02-03 13:24:11 +01:00
Enrico Turri
6fa49f5931
Added sequential print order id to 3D scene labels
2020-02-03 11:44:26 +01:00
Enrico Turri
251a7d1329
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_labels
2020-02-03 08:23:55 +01:00
Lukas Matena
378321231f
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
3a99b23ec7
#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
9ef65b23d8
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
08dcbd0271
Hollowing gizmo - most of updating now assumes that common data struct is updated properly
2020-01-30 14:31:39 +01:00
Enrico Turri
0407634824
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_labels
2020-01-29 15:46:48 +01:00
Enrico Turri
e679bcced6
Follow-up of 17a6b696e7
-> Fixed missing imgui window size initialization
2020-01-29 15:40:56 +01:00
Enrico Turri
504413cc91
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_labels
2020-01-29 12:31:50 +01:00
Enrico Turri
17a6b696e7
Workaround to fix SPE-1082 + refactoring of 6 dof camera
2020-01-29 12:08:38 +01:00
Lukas Matena
76927ce399
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
Enrico Turri
9032dadff3
Added extra frame renders to let labels grow to their final size
2020-01-28 15:57:02 +01:00
Enrico Turri
d5b258c267
1st installment of object/instance labels in 3D scene
2020-01-28 13:15:21 +01:00
tamasmeszaros
6b0af43665
Use mesh boolean in the backend to drill holes.
2020-01-24 10:53:40 +01:00
tamasmeszaros
b45e95877e
Merge branch 'master' into lm_tm_hollowing
2020-01-23 17:43:18 +01:00
YuSanka
5ff8ae955b
Implemented editing for extruder of existing ToolChangeCode tick
...
+ Code refactoring: DoubleSlider is extracted from wxExtensions
2020-01-23 16:11:21 +01:00
YuSanka
1ed313ab79
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
71fa411100
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
Lukas Matena
63b0eec5a9
Merge branch 'master' into lm_tm_hollowing
2020-01-21 13:00:07 +01:00
Enrico Turri
b368f8ff24
Fixed conflicts after merge with master
2020-01-17 14:58:19 +01:00
YuSanka
2259f7b3e8
Code refactoring to mode comparison
2020-01-17 12:24:58 +01:00
Enrico Turri
94a3d38afd
ENABLE_3DCONNEXION_DEVICES_CLOSE_SETTING_DIALOG set as default
2020-01-17 11:45:52 +01:00
Enrico Turri
4eee702984
ENABLE_ADAPTIVE_LAYER_HEIGHT_PROFILE set as default
2020-01-17 11:26:26 +01:00
Enrico Turri
b6ab6378d7
ENABLE_VIEW_TOOLBAR_BACKGROUND_FIX set as default
2020-01-17 10:50:25 +01:00
Enrico Turri
34aac7e292
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_6dof_camera
2020-01-17 08:13:58 +01:00
YuSanka
52c590f57a
Merge remote-tracking branch 'origin/ys_cp_improvements'
2020-01-16 16:06:19 +01:00
YuSanka
89fcd7f95a
Added "mode" variable for custom_gcode_per_print_z
2020-01-16 16:01:19 +01:00
Enrico Turri
6be4b3865b
Merge remote-tracking branch 'foxox/feature/ScaleSpeedLegendToVisible2'
2020-01-16 13:55:59 +01:00
Lukas Matena
822f9ff4a6
Fixed issues in SLA gizmos related to showing/hiding of the model/support structures
2020-01-16 13:18:43 +01:00
Enrico Turri
3f2ccf08d2
3Dconnexion devices translation linearly dependent on zoom
2020-01-16 10:17:07 +01:00
Enrico Turri
9df7eb4e08
Customizable use of 6 dof camera
2020-01-16 09:12:36 +01:00
Enrico Turri
62e60bcb43
Six degrees of freedom camera - 1st installment
2020-01-15 12:49:34 +01:00
YuSanka
4f1f507d5a
Fix of #3371
2020-01-06 12:41:27 +01:00
Lukas Matena
b3f15b1c98
Merge branch 'master' into lm_tm_hollowing
2019-12-20 10:33:53 +01:00
YuSanka
f7e06ded67
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
2019-12-17 14:16:58 +01:00
YuSanka
afcc6bbb08
Code refactoring for Color change implementation
2019-12-17 08:37:50 +01:00
Enrico Turri
43213b9548
Added [X] and [Close] buttons to close 3Dconnexion setting imgui dialog by clicking on them
2019-12-16 13:35:45 +01:00
bubnikv
e649a28ffc
Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer
2019-12-13 13:43:31 +01:00
bubnikv
65772958b7
Improved adaptive layer height metrics: Using the area of a triangle
...
delimited by the extrusion stepping and the sloping surface.
This leads to a yet different metric from Cura or upstream Slic3r.
2019-12-13 13:43:16 +01:00
Enrico Turri
f2b8607d11
Fixed positioning of gizmos' imgui dialogs
2019-12-12 13:38:08 +01:00
Lukas Matena
537260494d
Merge branch 'master' into lm_tm_hollowing
2019-12-12 11:37:33 +01:00
Enrico Turri
57d069bd0a
Some rework on layout of imgui dialogs
2019-12-11 15:30:25 +01:00
Enrico Turri
64fc278212
GLCanvas3D - render methods set as constant methods
2019-12-10 12:57:55 +01:00
bubnikv
03bb8a60a3
Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer
2019-12-10 11:13:09 +01:00
bubnikv
b12bc5c4d5
Optimization in GLCanvas3D::reload_scene():
...
Use sorting and binary search instead of linear search.
O(n log n) versus O(n^2)
2019-12-10 11:12:17 +01:00
Enrico Turri
bdfed9d9ef
Attempt to fix view toolbar background not showing up on Mac when using dark mode
2019-12-10 10:56:21 +01:00
Enrico Turri
68812b081f
Removed obsolete (and unused) code
2019-12-09 15:40:14 +01:00
foxox
dea83da5b7
Speed legend scales depending on travel visibility.
2019-12-08 00:03:41 -05:00
YuSanka
3acbc07caf
Localization improvements
2019-12-06 16:20:59 +01:00
YuSanka
805a6c936c
Localization improvements: Text correction
2019-12-06 13:58:23 +01:00
Enrico Turri
45f10a3730
ENABLE_ADAPTIVE_LAYER_HEIGHT_PROFILE -> Removed debug output and cleanup
2019-12-02 11:44:11 +01:00
Enrico Turri
40498eee44
ENABLE_ADAPTIVE_LAYER_HEIGHT_PROFILE -> Extended debug output to investigate issues on Mac and Linux
2019-11-29 14:24:24 +01:00
Lukas Matena
735f82c019
Hollowing gizmo has now its own shortcut [H], fixed a situation with supports showed in editing mode
2019-11-29 13:56:39 +01:00
Enrico Turri
1d5db5cf7a
ENABLE_ADAPTIVE_LAYER_HEIGHT_PROFILE -> Added debug output to investigate issues on Mac and Linux
2019-11-29 12:45:41 +01:00
Enrico Turri
3dd46f2e03
ENABLE_THUMBNAIL_GENERATOR -> some other refactoring
2019-11-28 15:19:42 +01:00
Enrico Turri
ddd1df1552
ENABLE_THUMBNAIL_GENERATOR -> render printbed into thumbnails
2019-11-28 14:18:24 +01:00
Enrico Turri
bd1ee8ee4a
Small refactoring in Camera::calc_zoom_to_bounding_box_factor
2019-11-28 12:14:31 +01:00
Enrico Turri
0de3704287
ENABLE_THUMBNAIL_GENERATOR -> small refactoring
2019-11-28 12:03:19 +01:00
Enrico Turri
3537f74936
Printbed axes renderable on demand
2019-11-28 11:51:00 +01:00
YuSanka
dfd38c7818
Merge remote-tracking branch 'origin/master' into ys_color_print_extension
2019-11-28 09:01:14 +01:00
YuSanka
901a20b3b1
Code cleaning
2019-11-27 15:27:44 +01:00
Enrico Turri
1ba3f0a4f6
Transparent background for thumbnails saved into gcode and sl1 files
2019-11-27 13:37:37 +01:00
Enrico Turri
5fcf41a3aa
ENABLE_ADAPTIVE_LAYER_HEIGHT_PROFILE -> Added undo/redo
2019-11-27 11:08:10 +01:00
Enrico Turri
55a163e216
Added tooltip, showing layer height at mouse cursor, to layer height profile bar
2019-11-26 14:44:14 +01:00
Enrico Turri
381d7e6c2e
ENABLE_ADAPTIVE_LAYER_HEIGHT_PROFILE -> Attempt to fix sliders size, on Mac, into imgui dialog for adaptive layers
2019-11-26 12:50:57 +01:00
Enrico Turri
643b26a0f3
ENABLE_ADAPTIVE_LAYER_HEIGHT_PROFILE -> Small refactoring
2019-11-26 12:24:07 +01:00
bubnikv
6fcd51d5be
Fix of "Slicer crashes when slicing for flexible filament" #2988
2019-11-22 16:08:25 +01:00