Commit Graph
100 Commits
Author SHA1 Message Date
Lukas Matena 6918f11100 Removed SLA unused code
Mostly the dead-ends that were tried when hollowing was being implemented
2020-03-03 15:53:26 +01:00
Lukas Matena 50ebdf5293 Include cleanup in Plater, GLCanvas3D and GLGizmosManager 2020-03-03 15:53:26 +01:00
Lukas Matena 87e77e20fa Include cleanup in several files
src/slic3r/Config/Snapshot.cpp
src/slic3r/Config/Snapshot.hpp
src/slic3r/Config/Version.cpp
src/slic3r/Config/Version.hpp
src/slic3r/GUI/2DBed.cpp
src/slic3r/GUI/3DBed.cpp
src/slic3r/GUI/3DScene.cpp
src/slic3r/GUI/3DScene.hpp
src/slic3r/GUI/AboutDialog.cpp
src/slic3r/GUI/AboutDialog.hpp
src/slic3r/GUI/AppConfig.cpp
src/slic3r/GUI/BackgroundSlicingProcess.cpp
src/slic3r/GUI/BackgroundSlicingProcess.hpp
2020-03-03 15:47:02 +01:00
Lukas Matena c70b34b6c8 Fixed several warnings
The biggest difference is changing PresetCollection::m_idx_selected from int to size_t, which fixed many warnings at once.
2020-03-03 15:47:02 +01:00
Lukas Matena f2b98bddee Fixing wxString::Format encoding mismatches (part 3) 2020-03-03 10:54:17 +01:00
Lukas Matena bcd3842183 Fixing wxString::Format encoding mismatches (part 2) 2020-03-03 10:54:17 +01:00
Lukas Matena 8b16b2c12e Fixing wxString::Format encoding mismatches (part 1) 2020-03-03 10:54:17 +01:00
Lukas Matena b95d635c4d Fixed several translated strings (fix of #3748) 2020-03-02 09:06:05 +01:00
Lukas Matena 7759eccf56 Fix of dark mode detection on macOS 10.12 and 10.13 2020-02-28 15:28:04 +01:00
Lukas Matena 03f17a13e7 Bugfix: SLA pad and supports were sometimes shown on instances that should have been hidden
The showing/hiding block cannot depend on whether the mesh was recently updated.
It would then not hide the supports and pad, which are calculated later than the hollowed mesh.
2020-02-27 17:58:27 +01:00
Lukas Matena 27f50778b2 Localization: Updated POT, new dictionaries for CZ, DE, ES, FR, IT, JA and PL 2020-02-27 15:47:15 +01:00
Lukas Matena 73ad48c135 Small fix of clipping plane positioning
If the clipping plane is moved automatically after hollowed mesh was created, move the clipping plane and fix current direction so it is not reset when user wants to move it
This is a quick solution for the 2.2.0 release. It should be later refactored as mentioned in the code.
2020-02-27 15:18:15 +01:00
Lukas Matena 08a6c86326 Slight change in clipping plane updating after hollowing finishes
The clipping plane in SLA gizmos is only moved in case that the gizmo is currently active and hollowing is actually enabled.
2020-02-27 15:18:15 +01:00
Lukas Matena 5a2da9597b Shared data for SLA gizmos have been removed from GLGizmoBase
This commit introduces no functional changes, only code-shuffling
2020-02-27 15:18:15 +01:00
Lukas Matena a3869736ba SLA gizmos can now be opened when any instance is selected
This was broken - only first instance worked
2020-02-27 15:18:15 +01:00
Lukas Matena b2b2574244 Fixed a crash when deleting an object after switching from SLA to FDM 2020-02-27 15:18:15 +01:00
Lukas Matena abca180f9f More polishing of translations 2020-02-27 14:11:20 +01:00
Lukas Matena aa8c97803c Fix of #3695
Ternary operator is given wxString and std::string, which does not work when implicit conversions between std::string and wxString are disabled
2020-02-25 15:53:01 +01:00
Lukas Matena c326b31c92 Enabled text-wrapping for tooltips in hollowing gizmo 2020-02-25 11:12:04 +01:00
Lukas Matena f475d994b3 Fixup of previous commit - actually added the translation macros 2020-02-24 15:24:12 +01:00
Lukas Matena e16786b701 Added a missing localization L mark 2020-02-24 14:54:44 +01:00
Lukas Matena 15ea6f5609 Several translation-related fixes
ConfigWizard name was missing translation macro in several places
Few typos corrected
Some string conversions fixed
Two strings were not marked for translation
2020-02-24 11:00:48 +01:00
Lukas Matena 53f1a283f3 Hollowing gizmo sliders now contain a unit where appropriate 2020-02-21 14:24:50 +01:00
Lukas Matena 676448581d Fixed a bug in hollowing gizmo - hole depth not matching slider value after selection 2020-02-21 14:23:50 +01:00
Lukas Matena 0486e412f4 Merge branch 'lm_bnavigator-fix-wxtypes'
Contains encoding fixes. Uncovered after disabling unsafe wxString conversions in wxWidgets.
2020-02-21 12:55:58 +01:00
Lukas Matena f60c117761 One more encoding problem
Uncovered after rebasing onto current master
2020-02-21 12:53:51 +01:00
Lukas Matena 91cabe5832 Fixed few more encoding issues
All uncovered after disabling unsafe wxString conversions
2020-02-21 12:53:51 +01:00
Lukas Matena 598ec04639 Hopefully a fix for #3683 (encoding in hollowing gizmo) 2020-02-21 12:53:28 +01:00
Lukas Matena 8be3d074fd Fix of wipe into object
The bug was introduced in 15eedef. lower_bound_by_predicate implementation returns first item that does not satisfy the predicate, not last item that does.
2020-02-21 10:05:33 +01:00
Lukas Matena 57c0a313a4 Fixed typo in an error message 2020-02-21 10:05:03 +01:00
Lukas Matena 74799ade14 Fixed two cases of crashes on application close
Both related to ObjectList - it was attempting to call plater after it was destroyed
Approved by @YuSanka
2020-02-21 10:02:41 +01:00
Lukas Matena bcdc8829e4 Merge branch 'lm_gizmos_aabb_calculation_rebased' (SLA gizmos polishing) 2020-02-21 09:49:39 +01:00
Lukas Matena 003a54600d Make sure that objects are correctly shown/hidden when switched 2020-02-21 09:46:40 +01:00
Lukas Matena 4c22023762 SLA gizmo clipping plane resetting
Clipping plane direction is now initialized when the plane is first moved, not when the gizmo is opened. This is how previous versions worked.
This is a minimal-effort solution before the clipping plane is refactored properly.
2020-02-21 09:46:40 +01:00
Lukas Matena 4df6a645f2 AABB trees for SLA gizmos are not calculated when the object is selected, but only after one of the gizmos is opened 2020-02-21 09:46:40 +01:00
Lukas Matena 90a8076d25 SLA support gizmo correctly hides drain holes if they are clipped by clipping plane 2020-02-20 15:04:53 +01:00
Lukas Matena b1145df566 Fixed incorrect filtering of extrusions during gcode generation
The behaviour resulted in duplicate extrusions in some cases
Fix of #3665
2020-02-18 09:52:34 +01:00
Lukas Matena 9b73ecdf02 Fixed printing order of skirt-brim intersecting extrusions (#3634) 2020-02-17 12:57:43 +01:00
Lukas Matena cd937d62b5 Make sure that filament stats in gcode are on separate lines 2020-02-14 12:50:26 +01:00
Lukas Matena f8c5855d55 Hollowing 'accuracy' and 'closing distance' are only shown in the hollowing gizmo when the respective mode is active 2020-02-13 15:55:36 +01:00
Lukas Matena 2f18101c77 Slightly changed hollowing gizmo title
'ing' forms were removed to match Cut gizmo
2020-02-13 14:22:16 +01:00
Lukas Matena 2f3b665ac5 Fixup of 6d0cf16: Export hollowed STL 2020-02-13 13:49:18 +01:00
Lukas Matena 2e62f03ba8 Small fix of 41388bd:
Interior mesh can be empty and TriangleMeshSlicer would fail in that case.
Also, recalculating shared vertices after repair should probably be done, TMS relies on it.
2020-02-11 15:25:28 +01:00
Lukas Matena 6d0cf16797 Export STL exports hollowed & drilled mesh (if it is shown) 2020-02-11 11:15:44 +01:00
Lukas Matena 79ce691d58 Don't calculate the AABB tree in FDM mode 2020-02-08 17:17:51 +01:00
Lukas Matena 6dd79d4923 Added a missing include
Suggested in #3621
2020-02-08 11:42:45 +01:00
Lukas Matena 808e45f5b3 Force backend update when hollowing gizmo is closed
Otherwise, moving holes will not invalidate the drilled mesh
One cannot do it immediately though, because that would also hide the hollowed mesh
2020-02-07 14:17:14 +01:00
Lukas Matena e66632a595 Hollowing parameters should be labeled the same in the gizmo and in presets 2020-02-07 14:03:55 +01:00
Lukas Matena 665bc9e960 Hollowing: allow to place drain holes on the inner surface of a hollowed cavity
Drain holes are not allowed to be placed on its own inner surface. This was recently (0e3ebb3)
done by forcing invalidation of the slaposDrillHoles, which also invalidates and therefore
hides the drilled mesh. However, that also hides the hollowed mesh and it is not possible
to place holes inside the cavity.

This change does not dump the drilled mesh, but checks that no raycast hit ends up in a hole.
2020-02-06 17:58:26 +01:00
Lukas Matena 3c23917e9e SLA gizmos: make sure that the clipping plane is properly reset to zero when the shown meshes are exchanged 2020-02-06 14:46:02 +01:00
Lukas Matena f902fc3445 Don't forget to copy drain holes when an object is copied 2020-02-06 14:23:03 +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
Lukas Matena 808cf2e38a Hollowing: merge meshes of holes with igl (intersecting holes) 2020-02-04 15:03:10 +01:00
Lukas Matena 58b5e75a9c SlaSupports gizmo - show holes position even when user did not Preview the drilled mesh 2020-02-04 15:03:10 +01:00
Lukas Matena d0f21dda4a Make sure that when drill holes are manipulated with, all data are invalidated properly
It is needed to regenerate hollow_mesh_with_holes completely, it may contain holes that were deleted by the user in the meantime
2020-02-03 17:31:18 +01:00
Lukas Matena 6a2604cfe0 Merge branch 'lm_drilling_backend_rebased' 2020-02-03 15:46:02 +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
Lukas Matena d407fda433 Hollowing gizmo - controls layout improvements 2020-02-03 15:17:18 +01:00
Lukas Matena 79da3a95e1 Clipping plane is now common for Hollowing and SLA supports gizmos 2020-02-03 15:17:18 +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
Lukas Matena 4bc4e347fb Fixed a crash during cut (typo introduced in 645f13a) 2020-01-31 08:54:41 +01:00
Lukas Matena a6f7fc93f4 Gizmo updates - forget everything about the loaded mesh when an object is deselected 2020-01-30 15:26:23 +01:00
Lukas Matena 4f43c6d3f8 SlaSupports gizmo - most of updating now assumes that common data struct is updated properly 2020-01-30 14:31:52 +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
Lukas Matena b0aa937215 Trying to improve drilling stability by handling CGAL exceptions 2020-01-29 15:57:49 +01:00
Lukas Matena b41c6d7d64 Refuse to drill a broken mesh
Hole parameters defaults and limits changed a bit
2020-01-29 14:07:12 +01:00
Lukas Matena 3f73261fdb 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 46fdce1169 SLA gizmos can now fetch hollowed and drilled mesh from the backend 2020-01-29 10:08:26 +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
Lukas Matena 5ae2f8a467 Function sla_trafo made accessible from outside SLAPrint.cpp unit 2020-01-29 10:07:10 +01:00
Lukas Matena cf391383a8 Merge branch 'lm_drilling_backend' 2020-01-24 10:56:40 +01:00
Lukas Matena 1c0aedbbe5 Hollowing gizmo can now trigger the backend calculation 2020-01-24 10:53:40 +01:00
Lukas Matena d58ee47e4d Fixed incorrect hole normal transformation when the object is anisotropically scaled 2020-01-24 10:53:40 +01:00
Lukas Matena 022cc0871a Allowed to do drilling without hollowing 2020-01-24 10:53:40 +01:00
Lukas Matena 63b0eec5a9 Merge branch 'master' into lm_tm_hollowing 2020-01-21 13:00:07 +01:00
Lukas Matena d8f2c8cdab Fixed a bug in the hole-aware raycaster 2020-01-17 16:02:23 +01:00
Lukas Matena 79e546816d Fixed unit test (sla_print_tests - random number generator seeding) 2020-01-16 14:03:43 +01:00
Lukas Matena 43fefd1c43 Merge branch 'lm_hollowing' into lm_tm_hollowing 2020-01-16 13:19:10 +01:00
Lukas Matena d9786f2bcd Fixed SLA gizmos picking problem - hollowed mesh was not rendered for picking 2020-01-16 13:18:43 +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
Lukas Matena 902d3bb904 Fixed loading of hole_height when a hole is selected (hollowing gizmo) 2020-01-16 13:18:43 +01:00
Lukas Matena 6e8bdb2c86 Fixed update of clipping plane when a gizmo was turned off 2020-01-16 13:18:43 +01:00
Lukas Matena 8c8256c6a2 Fixed diameter/radius mismatch in gizmo UI 2020-01-16 13:18:43 +01:00
Lukas Matena a3f3c868eb Removed needless calls to instance_bounding_box 2020-01-16 13:18:43 +01:00
Lukas Matena fd6c9582d5 Refactoring fix: making sure that mark_wiping_extrusions doesn't report it wiped something it didn't 2020-01-14 15:43:43 +01:00
Lukas Matena d0d73e6109 Hollowing config values contain min/max values, these are respected when setting through the gizmo
Rendering and hole transformation fixes (still WIP, though)
2020-01-14 10:33:10 +01:00
Lukas Matena f22961edae Fixed a raycaster problem with handling duplicate hits from igl
The duplicate hits confused winding number calculations in the raycaster, which in turn returned incorrect hit.
2020-01-09 14:09:26 +01:00
Lukas Matena e9d340c87f Fixed transformations of the hollowed GLVolume 2020-01-09 14:09:26 +01:00
Lukas Matena ff065aa9ba Switched order of hollowing and support points gizmos 2020-01-09 10:01:21 +01:00
Lukas Matena 6a870ef8bb Fixed incorrect z-shift when showing hollowed object 2020-01-06 16:02:55 +01:00
Lukas Matena 0551411c48 Merge branch 'master' into lm_tm_hollowing 2020-01-06 12:41:29 +01:00
Lukas Matena 68d0f5b4ef Corrected description of --loglevel parameter on command line output 2020-01-06 12:07:23 +01:00
Lukas Matena b08a315a46 Fix of #3359: Ender icon case was not matching profile name
Also added an icon to show when the correct one is not found
2020-01-06 10:39:33 +01:00
Lukas Matena 37c64b1a62 Hopefully a fix for #3342 - dark mode icons lookup 2019-12-21 14:43:22 +01:00
Lukas Matena 13f1bb2e43 An attempt to fix missing renaming from .gcode.tmp to .gcode
Added a missing include
2019-12-21 12:31:32 +01:00
Lukas Matena 4d182a5748 Fixed scaling of the holes and instance showing/hiding 2019-12-20 11:33:14 +01:00
Lukas Matena b3f15b1c98 Merge branch 'master' into lm_tm_hollowing 2019-12-20 10:33:53 +01:00
Lukas Matena cfd0fa9ae5 Merge branch 'lm_common_gizmos_data' into lm_tm_hollowing 2019-12-20 10:24:37 +01:00