Enrico Turri
c55a463c93
Do not show intermediate states in objects list while reloading from disk
2019-09-11 15:31:30 +02:00
Enrico Turri
26f3af4b16
Fixed modifiers after reload from disk
2019-09-11 15:02:57 +02:00
Enrico Turri
b383d9581a
Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into et_reload_from_disk
2019-09-11 09:01:44 +02:00
Enrico Turri
3835257ec2
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_reload_from_disk
2019-09-11 09:01:34 +02:00
Enrico Turri
7e5043961a
Added missing include
2019-09-11 08:51:36 +02:00
Enrico Turri
44c3493f7d
GCodeAnalyzer: Fixed a crash when encountering an invalid toolchange
2019-09-11 08:39:29 +02:00
Enrico Turri
27f01bb09e
Fixed instance printable property after reload from disk
2019-09-10 11:16:59 +02:00
Enrico Turri
0387401d8e
Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into et_reload_from_disk
2019-09-10 08:39:10 +02:00
Enrico Turri
6507b7bf39
Fixed gizmos update after objects loading
2019-09-09 15:55:04 +02:00
Enrico Turri
eae02f6cad
Fixed handling of mouse left up event when moving an object while the place on face gizmo is active
2019-09-09 14:56:55 +02:00
Enrico Turri
e7aaa0037d
Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into et_reload_from_disk
2019-09-09 12:15:24 +02:00
Enrico Turri
20ee14a2b3
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_reload_from_disk
2019-09-09 12:15:13 +02:00
Enrico Turri
749a1863e5
Fixed rotate gizmo hovering
2019-09-09 12:11:49 +02:00
Enrico Turri
015d430f03
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
2019-09-09 11:51:03 +02:00
Enrico Turri
a30c35d240
Follow-up of 9b5edbfa5f -> added comments
2019-09-09 11:50:19 +02:00
Enrico Turri
d954a70bbf
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
2019-09-09 09:56:52 +02:00
Enrico Turri
9b5edbfa5f
Fixed import from obj files
2019-09-09 09:56:36 +02:00
Enrico Turri
ae0fc75b13
Merge branch 'et_reload_from_disk' of https://github.com/prusa3d/PrusaSlicer into dev
2019-09-09 08:42:39 +02:00
Enrico Turri
98d8fa37c9
Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into dev
2019-09-09 08:28:16 +02:00
Enrico Turri
19616c4f93
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into dev
2019-09-06 17:53:17 +02:00
Enrico Turri
e6366894da
Fixed object settings after reload from disk
2019-09-06 17:26:08 +02:00
Enrico Turri
5b60fe272a
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_reload_from_disk
2019-09-06 17:25:39 +02:00
Enrico Turri
9cf3793aac
Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into et_reload_from_disk
2019-09-06 16:06:37 +02:00
Enrico Turri
abd170fbf4
Follow-up of 6c3aae8f89 -> Fixed update of objects list when object has a unique instance
2019-09-06 15:50:54 +02:00
Enrico Turri
6c3aae8f89
Fixed update of instances in objects list after reload from disk
2019-09-06 15:10:07 +02:00
Enrico Turri
4f1747d5f6
Keep correct instance selection after reload from disk
2019-09-06 14:36:47 +02:00
Enrico Turri
fe07bde385
Do not render intermediate states while reload from disk action is taking place
2019-09-06 13:49:15 +02:00
Enrico Turri
a7a01bfc72
Keep selection after reload from disk
2019-09-06 13:11:20 +02:00
Enrico Turri
d6c3c766aa
Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into et_reload_from_disk
2019-09-06 12:22:45 +02:00
Enrico Turri
bda0246b5d
Fix of #2868 -> Revert 2c9521c6d2 and partial revert of fab3634931
2019-09-06 09:44:39 +02:00
Enrico Turri
bdbaecb7f8
Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into dev
2019-09-05 09:55:08 +02:00
Enrico Turri
9b550fbd5b
Improved time estimator post-processing
2019-09-05 09:54:44 +02:00
Enrico Turri
3f5511faa3
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into dev
2019-09-05 08:14:34 +02:00
Enrico Turri
308f601a99
Removed another bunch of compile warnings
2019-09-04 10:46:51 +02:00
Enrico Turri
6bbc97f24d
Removed a bunch of compile warnings
2019-09-04 09:47:00 +02:00
Enrico Turri
0dfeee6caf
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
2019-09-02 15:15:36 +02:00
Enrico Turri
d0513fc2da
Fixed update of application's title bar when trying to import a non compatible .3mf or .amf project
2019-09-02 15:15:28 +02:00
Enrico Turri
292bff027e
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
2019-09-02 13:02:44 +02:00
Enrico Turri
729bd529dc
Fixed typo
2019-09-02 13:02:28 +02:00
Enrico Turri
bbfe420769
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
2019-09-02 11:56:33 +02:00
Enrico Turri
0b03f0eb66
2nd attempt to fix non compatible (newer) .3mf and .amf import error handling on Linux and OsX
2019-09-02 11:55:14 +02:00
Enrico Turri
813a73e614
Attempt to fix non compatible (newer) .3mf and .amf import error handling on Linux and OsX
2019-09-02 09:38:45 +02:00
Enrico Turri
fb9adaa661
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
2019-08-30 14:11:09 +02:00
Enrico Turri
f1f1b515cd
Fixed update of both canvas when compressed bed textures have been completely sent to gpu
2019-08-30 14:10:59 +02:00
Enrico Turri
f26d5effd9
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
2019-08-30 10:33:38 +02:00
Enrico Turri
bb65ad6f2c
Do not apply out of bed detection for non printable volumes
2019-08-30 10:33:21 +02:00
Enrico Turri
beed31ad58
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
2019-08-30 09:35:50 +02:00
Enrico Turri
54cf0f22d5
Fixed missing printable icon for 1st instance in objects list when opening a project containing objects with multiple instances
2019-08-30 09:35:34 +02:00
Enrico Turri
211a38b535
New toolbar icons for undo and redo actions
2019-08-30 08:32:18 +02:00
Enrico Turri
a8f7bb54a5
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
2019-08-29 15:38:43 +02:00
Enrico Turri
05c4976232
Do not automatically start slicing when switching to gcode preview if the Slice Now button is disabled
2019-08-29 15:38:21 +02:00
Enrico Turri
db0d877f85
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
2019-08-28 16:03:36 +02:00
Enrico Turri
a53539f9af
Fixed import of .3mf and .amf files. Parse contained XML model file by chunch instead that as a whole
2019-08-28 16:03:26 +02:00
Enrico Turri
19f6d87689
Follow-up of https://github.com/prusa3d/PrusaSlicer/commit/97473439cf4d7261f5dcd9a2400f3f7dd9cb5047 -> Further output size reduction
2019-08-28 11:06:30 +02:00
Enrico Turri
b8bd362553
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
2019-08-27 16:05:47 +02:00
Enrico Turri
97473439cf
Export toolpaths to obj -> Reduced size of output
2019-08-27 16:05:38 +02:00
Enrico Turri
b5c57fc134
Follow-up of c7cdb2fd3e -> Fixed localization of error messages for .3mf and .amf version check
2019-08-26 09:35:04 +02:00
Enrico Turri
7f589e79f7
Follow-up of 32dc4709a4 -> A more general fix
2019-08-26 09:06:21 +02:00
Enrico Turri
c7cdb2fd3e
Added version check for .3mf and .amf project files. PrusaSlicer will refuse to import files with newer version numbers.
2019-08-23 13:12:31 +02:00
Enrico Turri
1cf311529a
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
2019-08-23 12:28:03 +02:00
Enrico Turri
32dc4709a4
Workaround to fix gizmos' imgui dialog not showing up the first time the user activates them by using keyboard shortcuts.
2019-08-23 12:27:46 +02:00
Enrico Turri
189312624a
Disable layers editing if enabled while switching to SLA printer
2019-08-23 09:27:15 +02:00
Enrico Turri
2c9521c6d2
Model::convert_multipart_object() modified to keep original object position on the bed
2019-08-22 13:29:21 +02:00
Enrico Turri
56080bee8d
Merge branch 'et_colorprint_no_m600' of https://github.com/prusa3d/PrusaSlicer
2019-08-22 11:51:00 +02:00
Enrico Turri
42b8176e9b
Temporary human readable form for print color change tag for time estimate
2019-08-21 16:06:56 +02:00
Enrico Turri
c1d8fa377e
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_colorprint_no_m600
2019-08-21 15:21:23 +02:00
Enrico Turri
9cabb03f72
GCodeTimeEstimator uses annotated gcode in place of processing m600 lines to detect color print changes.
...
WARNING -> After this commit the exported gcode will contain the extra lines used by the time estimator. They will be removed by a future commit when a new post-process method will be implemented.
2019-08-21 14:43:14 +02:00
Enrico Turri
b79457b723
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_colorprint_no_m600
2019-08-21 14:09:45 +02:00
Enrico Turri
85ed363951
GCodeAnalyzer uses annotated gcode in place of processing m600 lines to detect color print changes
2019-08-21 14:09:20 +02:00
Enrico Turri
6e522cea15
Added missing include
2019-08-20 14:58:27 +02:00
Enrico Turri
403e2c7003
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_toolpaths_export
2019-08-20 14:35:39 +02:00
Enrico Turri
1b6490af4c
Export materials file for gcode toolpaths when exported to obj file
2019-08-20 14:35:23 +02:00
Enrico Turri
2e3c71baaf
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_toolpaths_export
2019-08-20 12:10:50 +02:00
Enrico Turri
f63b3ba600
Fixed gcode toolpaths data for export to obj file when taken from cpu
2019-08-20 12:10:15 +02:00
Enrico Turri
da00b7bfa5
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_toolpaths_export
2019-08-20 11:34:18 +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
730283a9e9
Export to obj file only toolpaths visible in 3D scene
2019-08-20 09:51:25 +02:00
Enrico Turri
1f6aab312b
1st installment of export of gcode toolpaths to obj file
2019-08-20 09:01:09 +02:00
Enrico Turri
0becfa0a04
Fix of #2739
2019-08-19 15:44:22 +02:00
Enrico Turri
8078e00c13
Fixed automatic update of perspective camera
2019-08-03 09:07:38 +02:00
Enrico Turri
77df54947b
Follow-up of c791ba776f -> Estimated times for color print layed-out as 'time for color (remaining time at color start)'
2019-08-03 08:51:03 +02:00
Enrico Turri
be72e23dec
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
2019-08-02 15:30:59 +02:00
Enrico Turri
1cdc3e0493
Workaround for gizmos being clipped by the perspective camera
2019-08-02 15:30:37 +02:00
Enrico Turri
c791ba776f
Added absolute time to estimated time for color print and fixed a bug in showing estimated times for print color for silent mode
2019-08-02 12:05:02 +02:00
Enrico Turri
28cc595350
#2593 - Fixed loading of .zip.amf files when running from command line
2019-08-02 09:43:41 +02:00
Enrico Turri
5f89414501
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
2019-08-01 11:01:26 +02:00
Enrico Turri
299739eeda
Refactoring into GLTexture::Compressor
2019-08-01 11:01:18 +02:00
Enrico Turri
f913bbf8ef
Reverted order of items in recent projects list
2019-08-01 09:03:06 +02:00
Enrico Turri
12a98bea94
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
2019-07-31 15:30:16 +02:00
Enrico Turri
4a3d7cfb0f
Follow-up of https://github.com/prusa3d/PrusaSlicer/commit/9548dfd88f00a6d0c8d94faf4ef36fafd3dfc84f -> an hopefully smarter fix
2019-07-31 15:30:03 +02:00
Enrico Turri
9548dfd88f
Fixed selection of full object from objects list
2019-07-31 11:52:24 +02:00
Enrico Turri
0647d3ac1e
Code cleanup
2019-07-31 11:12:50 +02:00
Enrico Turri
03820a38cf
Render non printable instances with a darker color
2019-07-31 11:01:50 +02:00
Enrico Turri
b1a1ed6394
Toggle instance printable member by 3D scene context menu
2019-07-31 10:12:13 +02:00
Enrico Turri
bdd694ddcb
Added member bool printable to ModelObject and ModelInstance
2019-07-31 08:36:08 +02:00
Enrico Turri
9593da2613
Take a single undo/redo snapshot when pasting from clipboard
2019-07-26 13:06:49 +02:00
Enrico Turri
eefd950e16
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_selection_undoredo
2019-07-26 11:34:05 +02:00
Enrico Turri
10b27968d1
Code cleanup
2019-07-26 11:32:44 +02:00
Enrico Turri
e8c38a93fc
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_custom_bed
2019-07-26 09:45:42 +02:00