1
0
mirror of https://github.com/FULU-Foundation/OrcaSlicer-bambulab.git synced 2026-07-12 08:14:26 +00:00
Commit Graph

10258 Commits

Author SHA1 Message Date
Enrico Turri 8ace8f4294 Picking using rectangle selection WIP 4 -> Prototype for selection update 2019-04-23 15:08:18 +02:00
Vojtech Kral e9d629f248 Build: Don't add imgui dir when SLIC3R_GUI is off 2019-04-23 14:57:26 +02:00
Vojtech Kral 2088abdc31 Build: Don't add slic3r dir when SLIC3R_GUI is off #1050 2019-04-23 14:19:13 +02:00
Vojtech Bubnik 31d377d09f Some refactoring and documentation, modified Windows dependencies to compile against patched wxWidgets 2019-04-23 12:35:26 +02:00
Enrico Turri a6ba6865bb Picking using rectangle selection WIP 3 -> Use parallel_for to extract data from the framebuffer copy 2019-04-23 12:07:35 +02:00
Vojtech Bubnik 0923bcec34 Added explicit linkage of pthreads library (needed on raspberry PI) 2019-04-23 11:02:57 +02:00
Enrico Turri 43ad9ff8b7 Picking using rectangle selection WIP 2 2019-04-23 10:45:41 +02:00
YuSanka 31c02b6bfb Added missing includes 2019-04-23 08:47:23 +02:00
Enrico Turri 705f7c8fa0 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_copy_and_paste 2019-04-23 08:03:54 +02:00
YuSanka 1f02eb704a Code refactoring: Deleted unused variables and _cleaned_ overbusy functions 2019-04-22 01:51:10 +02:00
YuSanka ff3f1c9ee0 Fixed application crash, if try to change Preset in a moment, when one of unregular pages is selected.
+ small code refactoring
2019-04-22 00:46:58 +02:00
YuSanka 4a20fd7f7e Fix of #1216 2019-04-21 23:12:39 +02:00
YuSanka 144b9e1e9d Merge remote-tracking branch 'origin/master' into ys_bug_fixing 2019-04-21 11:37:30 +02:00
bubnikv 5e45cff855 Merge branch 'ys_msw_dpi' of https://github.com/prusa3d/Slic3r into ys_msw_dpi 2019-04-18 17:16:42 +02:00
bubnikv e7d6586220 Another missing include 2019-04-18 17:16:31 +02:00
Enrico Turri 3fea03f885 Picking using rectangle selection WIP 2019-04-18 15:59:12 +02:00
Lukas Matena 55c07394e5 Added dialog with shortcuts to the SLA gizmo, tried to improve the dialog look 2019-04-18 15:46:35 +02:00
YuSanka b5533017fb Merge branch 'ys_msw_dpi' of https://github.com/prusa3d/Slic3r into ys_msw_dpi 2019-04-18 15:36:48 +02:00
YuSanka 5761c8f126 Merge remote-tracking branch 'origin/master' into ys_msw_dpi 2019-04-18 15:33:50 +02:00
YuSanka de55801e31 Merge remote-tracking branch 'origin/ys_bug_fixing' into ys_msw_dpi 2019-04-18 15:24:50 +02:00
bubnikv 08b01338a8 Fixed missing header (clang is picky) 2019-04-18 15:22:58 +02:00
bubnikv 3f74ec491e Partial fix of "Wrong width of perimeter for solid anchors #1803"
Improvement in handling of the "default" external perimeter width.
2019-04-18 15:08:11 +02:00
YuSanka 9cd3c594be Overrided on_dpi_changed() for some Dialogs:
AboutDialog, ConfigSnapshotDialog, FirmwareDialog, SysInfoDialog

+ set correct fonts for KBShortcutsDialog
2019-04-18 15:05:17 +02:00
bubnikv 1fd6748178 Fixed a typo in export_obj parameter label 2019-04-18 14:45:13 +02:00
Enrico Turri 1ffc6b5e64 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_copy_and_paste 2019-04-18 13:35:59 +02:00
Enrico Turri 4e01b22a3f Use new class GLSelectionRectangle (refactored) also in 3D scene 2019-04-18 13:35:39 +02:00
bubnikv 5ec507e9ea Fix of Complete individual objects: "checker" bug #1911"
Also fix of an arrangement issue for instances with some transformation
around X or Y axis applied.
2019-04-18 12:45:43 +02:00
Lukas Matena cfbd7f8093 Fixed conflicts after cherry-picking c8b4aa5a786e579abfdbf800b5eb1a0f0b04ff92 2019-04-18 10:32:47 +02:00
bubnikv 63a0d1aeee Added comments to the gettext dictionaries generated by the xgettext tool.
The prefix to be searched for in the source code comments is TRN
2019-04-18 10:13:56 +02:00
Enrico Turri 9e43193b86 1st installment of selection rectangle in 3D scene 2019-04-18 10:05:18 +02:00
Enrico Turri cc0d79755a Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_copy_and_paste 2019-04-18 08:07:57 +02:00
YuSanka e97e8c6af6 Overrided on_dpi_changed() for some Dialogs:
BedShapeDialog, KBShortcutsDialog, ConfigWizard, Preferences
2019-04-18 02:03:40 +02:00
YuSanka 077321b228 Implemented em_unit() function for getting of em_unit value from correct parent.
+ Added correct em_unit to Fields
2019-04-17 21:35:53 +02:00
Vojtech Kral eae6576162 Fix default bitmap loading in Field 2019-04-17 17:31:00 +02:00
Vojtech Kral 79e71cb8d3 ConfigWizard: Fix index width 2019-04-17 16:48:01 +02:00
Vojtech Kral b57452d090 Fix a bunch of race conditions between arrange and bg processing, fix #1770 2019-04-17 15:40:58 +02:00
Enrico Turri e7dcb9d93a Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_copy_and_paste 2019-04-17 14:48:52 +02:00
Lukas Matena 0c1e223414 SLA gizmo clipping plane is now not necessarily perpendicular to camera direction 2019-04-17 14:27:20 +02:00
Lukas Matena 8df2a19974 SLA clipping plane can now be controlled by Ctrl + mouse wheel rotation 2019-04-17 14:27:20 +02:00
Vojtech Kral 00ed0de815 Fix a format string in UpdateDialogs.cpp 2019-04-17 14:26:07 +02:00
YuSanka 3e9c0c396e Code refactoring 2019-04-17 12:49:10 +02:00
Enrico Turri 50516e3b7d Attempt to fix Ctrl+C from 3D scene on Mac 2019-04-17 10:27:33 +02:00
tamasmeszaros bbdc6a7881 Fix for incomplete validation condition on the allowable elevation. 2019-04-17 10:08:54 +02:00
Lukas Matena 19759b4315 SLA gizmo clipping - changed color on the cuts of supports, turned their rendering in editing mode (when the supports are not shown) 2019-04-17 09:39:51 +02:00
Enrico Turri 5ae6f3158a Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_copy_and_paste 2019-04-17 08:11:57 +02:00
YuSanka 3b9803ba6e Fixed crash of build under OSX and Linux.
+ Added flag to control if application rescale is possible
2019-04-16 17:06:28 +02:00
YuSanka 850eb86360 Merge remote-tracking branch 'origin/master' into ys_bug_fixing 2019-04-16 15:27:10 +02:00
bubnikv d83a013d6b Export of filament statistics into G-code for multi-material prints
has been rewritten to be easier to parse.

Old format
; filament used = 19248.8mm (46.3cm3)
; filament used = 57.4
; filament cost = 1.5
; filament used = 8007.6mm (19.3cm3)
; filament used = 23.9
; filament cost = 0.6
; filament used = 0.0mm (0.0cm3)
; filament used = 0.0mm (0.0cm3)
; filament used = 0.0mm (0.0cm3)
; total filament cost = 2.1

New format
; filament used [mm] = 1600.7,1600.7,1600.7,1600.7,1600.7
; filament used [cm3] = 3.9,3.9,3.9,3.9,3.9
; filament used [g] = 4.8,4.8,4.8,4.8,4.8
; filament cost = 1.5,1.5,1.5,1.5,1.5
; total filament used [g] = 24.0
; total filament cost = 7.5

Where the non-printing extruders are filled in with zeros, and
the trailing non-printing extruders are not exported.

; filament used [g]
and
; filament cost
are only printed if non zero (material density and cost are defined)
2019-04-16 14:25:50 +02:00
Enrico Turri 81abb58d49 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_copy_and_paste 2019-04-16 13:56:03 +02:00
Enrico Turri 25bfebfe8e Fixed typo in shortcuts dialog 2019-04-16 13:53:57 +02:00