GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-07-15 08:11:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
11,758 Commits 65 Branches 55 Tags
Commit Graph

229 Commits

Author SHA1 Message Date
supermerill
dda438c74b Merge commit '5e3e5492487690fb48cd7c4bb0b7e0e019e30a5c' (wip) 2019-12-05 20:53:02 +01:00
Enrico Turri
a624590b36 Fixed conflicts after merge with master 2019-11-07 09:55:44 +01:00
Enrico Turri
1e8aa54559 ENABLE_THUMBNAIL_GENERATOR -> Added ENABLE_THUMBNAIL_GENERATOR_DEBUG (disabled) 2019-11-07 09:01:28 +01:00
Enrico Turri
de60b40347 ENABLE_THUMBNAIL_GENERATOR -> Thumbnail data saved into gcode using base64 encoding + debug code to extract thumbnails from gcode 2019-10-25 12:18:10 +02:00
Enrico Turri
e6403a74ef ENABLE_3DCONNEXION_DEVICES tech set as default 2019-10-11 15:51:36 +02:00
Enrico Turri
6f85b0885a Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion 2019-10-07 09:31:43 +02:00
Enrico Turri
587effbedf ENABLE_3DCONNEXION_DEVICES -> Refactored Mouse3DController to be unaware of current active GLCanvas3D 2019-10-03 11:38:31 +02:00
tamasmeszaros
e675a5d5c6 Reworked pad creation algorithm with new parameters: 
* brim size
* force pad around object everywhere
 2019-10-01 14:58:37 +02:00
supermerill
01e61068da typos 2019-09-30 19:35:31 +02:00
Enrico Turri
4b3eab0ed9 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion 2019-09-27 14:52:30 +02:00
Enrico Turri
f958cfd2ff ENABLE_3DCONNEXION_DEVICES - 1st installment of support for 3Dconnexion devices 
Implemented using hidapi library (https://github.com/libusb/hidapi) and https://github.com/koenieee/CrossplatformSpacemouseDriver/tree/master/SpaceMouseDriver as reference

Unsolved issues:

- When manipulating the SpaceNavigator wxWidgets generates a mouse wheel event that needs to be filtered out

- wxWidgets does not detect devices being connected/disconnected to the pc

- Current state forces a continuous rendering

- Current state misses dependence on camera zoom

- Non intuitive movement limits

- Translation and rotation speed factors are hardcoded

- Number of device buttons hardcoded
 2019-09-27 14:52:19 +02:00
supermerill
2f042e030c Merge remote-tracking branch 'remotes/prusa/master' 
not merged: fill.cpp, perimeter_generator, because they ahve been reworked and need to be understand fully before adding my extensive modifications.
To verify: glcanvas: maybe filament color selection is deleted (or the other one i added?)
 2019-09-26 13:14:01 +02:00
Lukas Matena
7861fa5086 Whitespace changes to supress misleading indentation warnings 
These appear in newer gcc when spaces and tabs are mixed
 2019-09-24 16:01:01 +02:00
bubnikv
ae3a72d291 Fixed menu icons for undo / redo. 2019-08-30 16:05:12 +02:00
supermerill
ccc05c08fd Merge commit '85d9a165636617c76d30be54a1cd99bd4e5663b0' 2019-08-28 23:03:09 +02:00
bubnikv
c6604ff55d Merge remote-tracking branch 'remotes/origin/et_toolpaths_export' 2019-08-22 15:02:02 +02:00
bubnikv
c8a78f5d85 Merge remote-tracking branch 'remotes/origin/ys_bf_msw_scale' 2019-08-20 16:53:23 +02:00
Enrico Turri
58473f84ee Check for existence of gcode toolpaths that can be exported to obj file 2019-08-20 11:33:58 +02:00
Enrico Turri
a99a89a831 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_toolpaths_export 2019-08-20 09:51:44 +02:00
Enrico Turri
1f6aab312b 1st installment of export of gcode toolpaths to obj file 2019-08-20 09:01:09 +02:00
Lukas Matena
c8ac46df43 Fixed some memory leaks related to heap-allocated wxDialogs 
Some correctly destroyed dialogs were also converted to stack-allocated
 2019-08-15 12:52:56 +02:00
bubnikv
c91df2c769 Fixed a typo in print_host variable name 2019-08-05 14:36:50 +02:00
YuSanka
9471c9cd17 Implemented FR #2633 2019-08-01 16:25:08 +02:00
Enrico Turri
f913bbf8ef Reverted order of items in recent projects list 2019-08-01 09:03:06 +02:00
supermerill
773972cc2c Merge remote-tracking branch 'remotes/prusa/master' 
WIP, in particular, have to review the custom beds svg/stl
 2019-07-31 18:22:49 +02:00
bubnikv
ab7ecc1819 Merge remote-tracking branch 'remotes/origin/vb_undo_redo' 2019-07-15 11:34:18 +02:00
Enrico Turri
de88db5918 #2616 - Added Recent projects item to File menu 2019-07-12 15:36:01 +02:00
YuSanka
fbf14b42e9 Added undo/redo icons. Fist step to implementation Undo/Redo list for toolbar 2019-07-08 18:01:14 +02:00
YuSanka
7b6229289d Added undo/redo to the "Edit" menu 2019-07-08 10:57:35 +02:00
supermerill
00dd5c82bc useful test for "denser infill support layer" 
add some modifications to default & packaged settings
bugfix bridges
bugfix ctd
 2019-06-27 12:03:07 +02:00
supermerill
e9ff0e60a4 Merge remote-tracking branch 'remotes/prusa/master' 2019-06-25 19:08:32 +02:00
Enrico Turri
7aaba25520 Do not allow to copy/paste volumes when using sla printer 2019-06-24 13:21:05 +02:00
supermerill
47f5b30c5a Merge remote-tracking branch 'remotes/prusa/master' 2019-06-20 17:57:41 +02:00
YuSanka
12133f9599 Code cleaning and last msw_rescale() improvements 2019-06-19 11:38:42 +02:00
tamasmeszaros
468516aa31 Apply fixes for the ui jobs. 
- Localization
- Mutual exclusion (ExclusiveJobGroup), only one UI job can run at a time, and background processing is stopped
- m_range not used for finalization anymore
- stop_jobs called before Window is closed
 2019-06-18 16:24:30 +02:00
tamasmeszaros
d60ecb3788 Merge remote-tracking branch 'origin/master' into tm_ui_jobs 2019-06-18 12:16:24 +02:00
tamasmeszaros
ce22251707 Warning hunt session followup 2019-06-17 10:05:46 +02:00
Enrico Turri
2a973c1dfa Removed tech DISABLE_DESELECT_ALL_MENU_ITEM 2019-05-21 09:23:45 +02:00
bubnikv
cd1a445c83 Fixed update of the project name in the status line in case the name 
of the project contains dots.
 2019-05-20 14:30:55 +02:00
Enrico Turri
7bb79062e6 Ctrl+Shift+S in place of Ctrl+Alt+S for command Save Project as on Mac 2019-05-20 10:02:51 +02:00
supermerill
8840d01fb0 Merge remote-tracking branch 'remotes/prusa/master' 2019-05-16 19:55:45 +02:00
YuSanka
cc933789eb Fix of #2249 2019-05-16 13:16:43 +02:00
YuSanka
0bcb449fb4 em_unit initialization in one place (DPIAware constructor) 2019-05-15 16:44:33 +02:00
Enrico Turri
d0fd8a4a29 Follow-up of f54fd10897cae193a783622af85d56e5e1293a86 -> Project name stored with no extension, updated after drag and drop of .3mf or .amf files and used by export g-code and send g-code commands 2019-05-15 14:09:16 +02:00
Enrico Turri
8ae1dfd4d0 File->Open Project allows to load .amf files 2019-05-15 10:23:02 +02:00
YuSanka
6e5df76f2e Don't call SetFont() for MainFrame and wxNotebook under OSX to avoid name cutting in ObjectList 2019-05-14 15:41:20 +02:00
Enrico Turri
f54fd10897 Implementation of File->New project menu item 2019-05-14 15:00:24 +02:00
Enrico Turri
14c4469cbf Added Esc shortcut and menu item for command deselect all 2019-05-14 11:57:39 +02:00
Enrico Turri
016c5f6557 Added placeholder for File->New Project menu item 2019-05-14 10:30:14 +02:00
tamasmeszaros
696ade15ca New way of starting arrange and rotation optimization. 
To prevent segfaults when exiting while processing is running.
 2019-05-13 18:58:56 +02:00