3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-11-02 12:41:18 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 5
15125 commits 12 branches 72 tags 1.6 GiB
Commit graph

5162 commits

Author SHA1 Message Date
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
Enrico Turri
648060f4ec Smoother movements/rotations when using arrow keys 2020-02-04 10:31:50 +01:00
Enrico Turri
3371fa42da Follow-up of e042cab8fa -> Avoid polluting undo/redo stack 2020-02-04 09:32:09 +01:00
YuSanka
d320a03c54 DoubleSlider: Added using of default colors for color changes in SingleExtruder Mode (#3449) 
+ added missed input parameter to the BitmapCache::mksolid() which was cause a wrong drawing of the Extruder selector under OSX
 2020-02-03 21:28:55 +01:00
Enrico Turri
e042cab8fa Follow-up of 8453c88482, c09091c407 and 9d55121695 -> Use key down event in place of key up event 2020-02-03 16:05:13 +01:00
Enrico Turri
f09bed32b6 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-02-03 15:48:56 +01:00
Enrico Turri
03680bb014 Follow-up of 3a99b23ec7 -> F5 accelerator added also to objects list 2020-02-03 15:47:09 +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
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
8453c88482 Cut Gizmo -> added movements using arrow keys: 
Up arrow = increase Z by 1mm

Down arrow = decrease Z by 1mm
 2020-02-03 15:00:49 +01:00
Enrico Turri
c09091c407 Rotate Gizmo -> added rotations using arrow keys: 
Left arrow = 90 degrees around Z axis CCW

Right arrow = 90 degrees around Z axis CW

Up arrow = 45 degrees around Z axis CCW

Down arrow = 45 degrees around Z axis CW
 2020-02-03 14:51:25 +01:00
Enrico Turri
9d55121695 Move Gizmo -> added movements using arrow keys: 
Left arrow = decrease X by 1mm

Right arrow = increase X by 1mm

Up arrow = increase Y by 1mm

Down arrow = decrease Y by 1mm
 2020-02-03 14:39:16 +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
0937c576ac Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_labels 2020-02-03 11:43:37 +01:00
Slic3rPE
e50825ce05 missing includes 2020-02-03 10:13:15 +01:00
YuSanka
5b103116c5 Added missed include under OSX 2020-02-03 09:24:58 +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
YuSanka
3f7ebee396 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
eb6e0c06e4 Mark a tick as a conflict, if it has a ToolChange to the same extruder 2020-02-02 21:20:48 +01:00
YuSanka
438f4fd1aa Fixed build under OSX 2020-02-02 19:40:00 +01:00
YuSanka
be92e10985 Added missed include for OSX 2020-01-31 21:03:17 +01:00
YuSanka
1472ad9b14 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
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
a6f7fc93f4 Gizmo updates - forget everything about the loaded mesh when an object is deselected 2020-01-30 15:26:23 +01:00
YuSanka
570f77cbdc Implemented DnD for objects inside ObjectList 2020-01-30 15:01:47 +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
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
16fa68df0c Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_labels 2020-01-29 14:46:09 +01:00
Enrico Turri
da3cb30b7c Follow-up of 17a6b696e7 -> Fixed build when tech ENABLE_6DOF_CAMERA is disabled 2020-01-29 14:44:03 +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
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
f7f1e2ce42 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-01-29 12:09:34 +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
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
YuSanka
d45744b7bb Typo fix for a38735b4ae 2020-01-28 16:40:31 +01:00
YuSanka
cd2973fad3 Typo fix for a38735b4ae 2020-01-28 16:23:55 +01:00
YuSanka
a38735b4ae 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
9032dadff3 Added extra frame renders to let labels grow to their final size 2020-01-28 15:57:02 +01:00