Lukas Matena
0de6e53219
Followup of 6ab1cec
- empty layers are ok if there are only other empty layers on top of them
...
Also fixed a possible crash in Print.cpp when preparing the wipe tower layers
2019-08-04 22:57:59 +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
YuSanka
eaccd73756
Added InvalidItem() to ObjectDataViewModel to controling if item till exist during multiple deleting
...
+ some code cleaning
2019-08-02 17:53:35 +02:00
Lukas Matena
6ab1cec48c
Empty layers detection added to GCode.cpp
...
Added detection of empty layers so the wipe tower doesn't trip on them (it is not printable anyway).
This should improve wipe tower reliability with supports, objects standing on edges, etc.
I also turned an assert into exception throw to prevent hard crashes and nonsense output.
2019-08-02 16:54:18 +02:00
YuSanka
3b24565411
Fixed wrong naming of bottom infill pattern
2019-08-02 16:16:12 +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
Vojtech Kral
bfb135bcc3
Comment out stale implementation in Serial, fix #2150
2019-08-02 15:20:52 +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
YuSanka
9471c9cd17
Implemented FR #2633
2019-08-01 16:25:08 +02:00
tamasmeszaros
7d25d8c677
Can build with (original llvm) clang-cl on windows
2019-08-01 16:03:52 +02:00
YuSanka
ec9117cc06
Split snapshot text for separated fazes (in ObjectList)
2019-08-01 15:40:42 +02:00
Lukas Matena
170bd8b064
Wipetower fix: temperature-changing command was sometimes missing after the toolchange
...
Cause: variable holding last issued temperature was not reset where it should have been
This should fix issue #2685
2019-08-01 15:31:02 +02:00
bubnikv
07250bd781
Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer
2019-08-01 15:25:40 +02:00
bubnikv
9f393e6b9b
Not taking the snapshot with non-empty Redo stack will likely be more confusing than losing the Redo stack.
...
Let's wait for user feedback.
2019-08-01 15:25:35 +02:00
YuSanka
885da35544
Merge remote-tracking branch 'origin/master' into ys_printable_property
2019-08-01 15:15:18 +02:00
YuSanka
59db1f7f36
Code refactoring to add PrintableItem column to ObjectList
2019-08-01 14:58:04 +02:00
YuSanka
c2a43dc864
Mirroring buttons: Fixed scaling issues and ensured proper hiding on Win
2019-08-01 14:39:23 +02:00
Lukas Matena
98e08e356f
Changed snapshot names for reset scale/reset rotation/drop to bed functions (it's done a bit simpler this time)
2019-08-01 12:41:31 +02:00
Lukas Matena
81ab43ea9a
Revert "Changed snapshot names for reset rotation/reset scale/drop to bed functions"
...
This reverts commit 1ca8ff1285
.
2019-08-01 12:23:39 +02:00
bubnikv
576643c7ed
Bumped up the version to 2.1.0-alpha0.
...
Updated the bundled profiles to integrate retract overrides
for PET and FLEX materials.
2019-08-01 11:53:22 +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
Lukas Matena
1ca8ff1285
Changed snapshot names for reset rotation/reset scale/drop to bed functions
2019-08-01 10:58:52 +02:00
Enrico Turri
f913bbf8ef
Reverted order of items in recent projects list
2019-08-01 09:03:06 +02:00
YuSanka
47c9714062
Added Real-Time DXT1/DXT5 C compression library to CopyrightsDialog
...
+ updated icons for mirroring
2019-07-31 17:38:06 +02:00
YuSanka
78645ca9ce
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
2019-07-31 17:14:51 +02:00
YuSanka
cf6cc1d863
Refactored LockButton class
2019-07-31 17:14:32 +02:00
bubnikv
93f86b795d
asserts for accessing deleted object list nodes.
2019-07-31 16:36:56 +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 9548dfd88f
-> an hopefully smarter fix
2019-07-31 15:30:03 +02:00
bubnikv
1ba9100994
Fix of gizmo deserialization after Undo / Redo: Deselect all gizmos
...
but the gizmo to be deserialized.
2019-07-31 14:00:43 +02:00
YuSanka
3bade450b8
Merge remote-tracking branch 'origin/ys_overrides'
2019-07-31 13:05:47 +02:00
Lukas Matena
aeb29b1184
SLA points on all objects are assigned Generating status before the background processing starts
2019-07-31 13:00:35 +02:00
Lukas Matena
599f2e07db
Config parameters accessible from SLA gizmo are now saved on the undo/redo stack
2019-07-31 12:40:47 +02:00
YuSanka
02324becdb
Merge remote-tracking branch 'origin/master' into ys_printable_property
2019-07-31 12:04:15 +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
Lukas Matena
ab0d1af3ca
Fixed a problem with deleting button in SLA gizmo
2019-07-31 10:33:03 +02:00
Lukas Matena
99f34f8321
SLA gizmo: fixed a crash with multiple selection
2019-07-31 10:18:49 +02:00
Enrico Turri
b1a1ed6394
Toggle instance printable member by 3D scene context menu
2019-07-31 10:12:13 +02:00
YuSanka
8d3d4b3ae7
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
2019-07-31 09:49:45 +02:00
YuSanka
7746825ab4
Temporary commented copy/paste for Layers
2019-07-31 09:46:45 +02:00
Enrico Turri
bdd694ddcb
Added member bool printable to ModelObject and ModelInstance
2019-07-31 08:36:08 +02:00
tamasmeszaros
1ab3268d55
Performance optimizations and some cleanup.
...
Optional heavy parallelism which is disabled by default. Would like to test it further in a next release cycle.
2019-07-30 17:57:07 +02:00
tamasmeszaros
ca1f3dc6af
Improved logging of SLA support tree creation.
2019-07-30 17:55:22 +02:00
tamasmeszaros
57008d0d77
Include SLACommon.hpp into the project.
...
File is reformatted, but only the whitespace is changed.
2019-07-30 17:54:25 +02:00
tamasmeszaros
cc5d74084c
Fix memory leak in ProgressStatusBar
2019-07-30 17:52:05 +02:00
bubnikv
ca1c78b3fc
Merge remote-tracking branch 'remotes/origin/et_custom_bed'
2019-07-30 16:48:47 +02:00
YuSanka
7266259269
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
2019-07-30 15:48:46 +02:00
YuSanka
66497cdb1f
Fixed SPE-993
...
+ Added new icons for layers editing
2019-07-30 15:48:30 +02:00
Lukas Matena
94f9b701e2
Merge branch 'lm_sla_gizmo_undo'
2019-07-30 14:52:44 +02:00
Lukas Matena
07608a80cd
SLA gizmo - making sure the cone direction is correctly undone/redone
2019-07-30 14:51:57 +02:00
tamasmeszaros
320f964847
Fixing zero elevation bug when concave hull overlap was not detected.
...
Backported from tm_perf_optims
2019-07-30 14:24:42 +02:00
YuSanka
7c2e199472
Try to fix selection of overridden option when TextCtrl is focused
...
Note: the problem was observed only under OSX
2019-07-30 14:16:07 +02:00
YuSanka
b7d6c93c36
Suppressed editing of overridden options only if "filament_retract_length" == 0
2019-07-30 12:06:51 +02:00
Lukas Matena
7f33e23fbb
Added new icons for mirroring buttons and 'drop modifier to bed' function
2019-07-30 08:39:38 +02:00
YuSanka
7bad550c83
Fix of #2326 (Annoying warning dialog when set extrusions > 1mm)
2019-07-29 18:03:06 +02:00
bubnikv
45b4c87926
Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer
2019-07-29 17:55:58 +02:00
bubnikv
3d9df02f5f
When accessing the localized web pages provided by Prusa Research,
...
only those language codes are now passed to the Prusa Research
web server, which are currently supported.
For example, there is no web page for "en_UK", the "en_UK" code will be
translated to "en_US".
2019-07-29 17:55:50 +02:00
YuSanka
05325e4f2e
Set "wipe_into_infill" and "wipe_into_objects" options to the "Wipe options" category instead of "Extruders"
2019-07-29 16:56:24 +02:00
bubnikv
3b21c64c2e
Fix of "Unable to slice in command line mode: Mixing configurations
...
for FFF and SLA technologies" #2426
2019-07-29 16:19:32 +02:00
YuSanka
253d755235
Fix for 7b5c8b7e16
2019-07-29 16:08:36 +02:00
YuSanka
47b3440561
Fix of #2401
2019-07-29 15:44:00 +02:00
YuSanka
e469ee76b8
Implemented a highlighting of the delete button for setting (related to #1767 )
2019-07-29 15:14:25 +02:00
YuSanka
7b5c8b7e16
Implemented some upgrades for filament overrides
2019-07-29 14:00:22 +02:00
Lukas Matena
eeef3b42df
SLA gizmo now uses the new separate undo/redo stack for manual editing mode
2019-07-29 13:07:49 +02:00
YuSanka
b8a549259c
Merge remote-tracking branch 'origin/master' into ys_overrides
2019-07-28 22:12:27 +02:00
YuSanka
d0d01ef7ab
Merge remote-tracking branch 'origin/vb_filament_overrides' into ys_overrides
2019-07-28 22:01:48 +02:00
YuSanka
40a576a8ad
Implemented update of the override filaments options from/to config
2019-07-28 22:00:39 +02:00
Lukas Matena
fe62362960
Hiding the sla support structures after undo/redo
2019-07-28 11:37:08 +02:00
Vojtech Kral
ba21d606af
Fix a ternary op type error in Tab
...
Fix #2668
Fix #2676
2019-07-26 14:27:37 +02:00
bubnikv
08a90b8c1b
Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer
2019-07-26 13:44:41 +02:00
bubnikv
30d4bfd410
New Undo / Redo stack for the gizmos. The Gizmo specific stack is
...
entered with Plater::enter_gizmos_stack(), and left with
Plater::enter_gizmos_stack(). Other than that, the 2nd Undo / Redo
stack is transparent to the user of the Plater.
WIP: Currently the Gizmo stack takes a snapshot of the whole scene on
Plater::enter_gizmos_stack(). While it should work, it may be cheaper
to modify the Undo/Redo stack to only take a snapshot of the gizmos
in the Gizmo mode.
2019-07-26 13:44:33 +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
Enrico Turri
77857f7292
Refactoring into rendering pipeline
2019-07-26 09:45:22 +02:00
YuSanka
99bd054e99
Fixed updating of an option list for additional settings
2019-07-25 17:25:14 +02:00
bubnikv
17edc289e9
Fixed missing return value.
2019-07-25 17:18:51 +02:00
bubnikv
86287a28ec
Fixed the Perl bindings, made Print::m_placeholder_parser protected,
...
removed the non-const accessor method to m_placeholder_parser.
2019-07-25 17:08:31 +02:00
YuSanka
6ea692ff34
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
2019-07-25 16:23:57 +02:00
YuSanka
77401ed79d
Upgrade for ModeButtons
2019-07-25 16:23:32 +02:00
Enrico Turri
f4209dce0b
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_selection_undoredo
2019-07-25 15:29:58 +02:00
Enrico Turri
9bcdb2ebd0
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_custom_bed
2019-07-25 15:29:25 +02:00
Enrico Turri
4e4bdb5edd
Removed obsolete code
2019-07-25 15:28:34 +02:00
bubnikv
2bcdfc8378
Merge remote-tracking branch 'remotes/origin/master' into vb_filament_overrides
2019-07-25 14:40:54 +02:00
bubnikv
f8218eb903
Reworked the FFF Print::update() to process the filament retract
...
override values and to store them into the output G-code.
2019-07-25 14:39:19 +02:00
Enrico Turri
e5b108b26e
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_selection_undoredo
2019-07-25 13:44:02 +02:00
Enrico Turri
e23dbfa3fb
Added missing include (OsX build)
2019-07-25 13:42:42 +02:00
Enrico Turri
0745a94a98
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_custom_bed
2019-07-25 13:11:17 +02:00
Enrico Turri
d27d3257f7
Added tooltip to filename fields for custom texture and model into bed shape dialog to show the full path of the file
2019-07-25 13:10:57 +02:00
Enrico Turri
d6f03a2f52
Bed model placed into the scene so that its origin goes into shape center
2019-07-25 11:34:42 +02:00
Enrico Turri
bc680b8376
Draw lighter gridlines when rendering default procedural texture on print bed when seen from above and custom model is present
2019-07-25 10:38:18 +02:00
Enrico Turri
9625fe8f5b
Render custom bed model on custom beds
2019-07-25 09:45:43 +02:00
Enrico Turri
48dc2bb762
Fixed positioning of bed model into the scene and changed bundled bed models
2019-07-25 08:43:21 +02:00
Enrico Turri
1483a7fd51
Render custom bed model on prusa beds
2019-07-24 14:02:36 +02:00
Enrico Turri
0a04a6d92a
Add remove all from selection command to undo/redo stack only when the redo stack is empty
2019-07-24 13:51:39 +02:00
YuSanka
ab2519cde4
Merge remote-tracking branch 'origin/master' into ys_overrides
2019-07-24 12:47:00 +02:00
YuSanka
dd50c9f062
Merge remote-tracking branch 'origin/vb_filament_overrides' into ys_overrides
2019-07-24 12:40:07 +02:00
bubnikv
42c8940795
Fixed is_nil() method on ConfigOptions.
...
PlaceholderParser was extended to support external config.
The external config has a lowest priority when looking up a variable.
2019-07-24 12:39:01 +02:00
YuSanka
1a3fc0994b
Fix for 0592ae65ee
2019-07-24 12:32:38 +02:00
YuSanka
0592ae65ee
Completed setting of the item focus in ObjectList after undo/redo
2019-07-24 11:25:04 +02:00
Enrico Turri
395e794b9e
Refactoring in Bed3D
2019-07-24 11:04:04 +02:00
Enrico Turri
f7d238cb2d
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_custom_bed
2019-07-24 10:11:28 +02:00
Enrico Turri
7e7550b416
Custom bed texture applied to custom bed shapes
2019-07-24 10:11:17 +02:00
Enrico Turri
1f083ac1ee
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_selection_undoredo
2019-07-24 09:47:11 +02:00
Enrico Turri
18965f5c22
Do not store into undo/redo stack remove all from selection command
2019-07-24 09:47:01 +02:00
YuSanka
62f997d167
Merge remote-tracking branch 'origin/vb_filament_overrides' into ys_overrides
2019-07-24 09:29:10 +02:00
YuSanka
804e1b1939
Fixed ObjectList::last_volume_is_deleted() to avoid clearing volume[0].config after undo/redo
2019-07-23 17:30:32 +02:00
bubnikv
6ea3a8e2b4
WIP: Nullable config values. Fixed compare operator for float vectors.
2019-07-23 17:15:34 +02:00
YuSanka
a121253520
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
2019-07-23 16:18:14 +02:00
YuSanka
4245b61afc
Added SETTINGS_SELECTED_ON_SIDEBAR flag to undo/redo
2019-07-23 16:17:37 +02:00
YuSanka
7bc893d99a
Update all extriders nozzle diameters according to the single_extruder_multi_material flag
2019-07-23 16:12:52 +02:00
Enrico Turri
1b5ba6c823
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_custom_bed
2019-07-23 15:36:39 +02:00
Enrico Turri
1f24e82690
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_selection_undoredo
2019-07-23 15:34:38 +02:00
Lukas Matena
0ae46b0635
SLA gizmo and undo/redo: 'autogenerated points' state is now correctly undone/redone
2019-07-23 15:23:38 +02:00
Enrico Turri
9a127ed016
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_selection_undoredo
2019-07-23 15:14:19 +02:00
Enrico Turri
0d10d8aba7
1st installment for selection's undo/redo snapshots
2019-07-23 15:14:08 +02:00
bubnikv
3b1a44c084
WIP: Nullable configuration value concept, implemented for
...
ConfigOptionFloatsNullable, ConfigOptionIntsNullable,
ConfigOptionPercentsNullable, ConfigOptionBoolsNullable.
retract override values were added to the Filament profile:
vector of floats: "retract_length", "retract_lift", "retract_lift_above",
"retract_lift_below", "retract_speed", "deretract_speed",
"retract_restart_extra", "retract_before_travel",
vector of bools: "retract_layer_change", "wipe"
vector of percents: "retract_before_wipe"
2019-07-23 14:15:42 +02:00
Lukas Matena
91a5d70a62
Fixed a few warnings in headers (meaning they were reported once for each include)
...
Fixed an identification of CXX compiler in cmake so that 'AppleClang' is recognized
2019-07-23 14:02:20 +02:00
Lukas Matena
506be9035b
Wipe tower now supports filaments with diameters different from 1.75 mm
2019-07-23 14:02:20 +02:00
Enrico Turri
3fe355509c
Fixed undo/redo snapshot when opening a project using the recent files list
2019-07-23 12:57:58 +02:00
Lukas Matena
2c6e4b4e5b
Fixed a missing include in UndoRedo.cpp
2019-07-23 09:40:07 +02:00
bubnikv
b34252bf0f
Fixed compilation on clang.
2019-07-22 17:26:06 +02:00
bubnikv
bed21b1e2d
Undo / Redo refactoring: Moved the snapshot flags definition
...
to SnapshotData
2019-07-22 17:00:50 +02:00
bubnikv
a5c64e8477
Refactoring of the Undo / Redo stack interface:
...
The Snapshot specific data, which is fully provided from the outside
of the Undo / Redo stack is now stored as an StackData structure.
The StackData structure may be extended with small size data,
like the cursor position in the side bar.
2019-07-22 16:52:47 +02:00
bubnikv
356166ad86
Merge branch 'master' into ys_overrides
2019-07-22 16:27:00 +02:00
YuSanka
9d59d65fad
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
2019-07-22 13:39:16 +02:00
YuSanka
7dd63b2c00
Added takesnapshot() call for:
...
- split of the instances,
- renaming of the Object/Volume item
- changing of the additional settings.
2019-07-22 13:38:53 +02:00
Enrico Turri
7749677b27
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_custom_bed
2019-07-22 11:57:17 +02:00
Enrico Turri
ced853bff0
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
2019-07-22 11:47:40 +02:00
Enrico Turri
dcedb9e3d3
Follow-up of 699319cd86
-> Fixed build on Mac
2019-07-22 11:47:23 +02:00
tamasmeszaros
a59e782e85
Update Arrange tooltip: [Shift+A]
2019-07-22 11:36:56 +02:00
Enrico Turri
c1dee0e87d
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_custom_bed
2019-07-22 11:26:02 +02:00
Enrico Turri
996b227391
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
2019-07-22 11:23:52 +02:00
Enrico Turri
699319cd86
#2663 - Added handling of gcode lines M401 and M402 for Repetier flavour to GCodeAnalyzer
2019-07-22 11:23:42 +02:00
tamasmeszaros
764efb1385
Remove disabled code.
2019-07-22 11:18:10 +02:00
tamasmeszaros
dcb073d4fd
Merge branch 'tm_arrange_selection'
2019-07-22 11:14:34 +02:00
YuSanka
fb39516c65
Added checking for a extruder value in ObjectList. Set value to "default" if "0" is selected.
2019-07-22 10:28:25 +02:00
YuSanka
f6633df57b
Fix of SPE-987 (Slicer crash when layers are selected in right panel and settings is added)
2019-07-22 09:41:34 +02:00
bubnikv
8112d80fa2
Merge branch 'master' into ys_overrides
2019-07-22 09:36:55 +02:00
Enrico Turri
9cb1a584e1
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_custom_bed
2019-07-22 08:21:40 +02:00
enricoturri1966
b60b44ed5e
Added additional tooltip to toolbar items and use it for undo/redo items
2019-07-20 14:03:34 +02:00
enricoturri1966
33c0683d11
Reworked rendering of toolbars background texture
2019-07-20 12:02:29 +02:00
tamasmeszaros
8d66b51e8c
Merge branch 'master' into tm_arrange_selection
2019-07-19 18:17:58 +02:00
tamasmeszaros
10e86a06cc
Dont do force_full_scene_refresh after arrange.
2019-07-19 18:16:36 +02:00
tamasmeszaros
63fada9469
Arrange selection if shift is pressed. Remove first item centering
2019-07-19 18:10:10 +02:00
Vojtech Kral
99e2fe20a5
Fix a memory access bug in ObjectManipulation
2019-07-19 17:58:46 +02:00
bubnikv
47df9506bb
Fix of OSX Imgui Undo / Redo pull down list scaling issue.
2019-07-19 17:16:20 +02:00
bubnikv
07a3072622
Simplified loading of the SLA support structures into the scene.
...
Fixed referesh of SLA support structures after Undo / Redo
and when moving an object outside / inside the build volume.
2019-07-19 17:14:37 +02:00
bubnikv
ba997be812
Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer
2019-07-19 15:59:35 +02:00
bubnikv
152c2fe0c0
Undo / Redo pull down menu scaling fix on OSX Retina
2019-07-19 15:59:23 +02:00
Enrico Turri
3285bf7945
Fixed conflicts after pulling from master
2019-07-19 15:47:10 +02:00
Enrico Turri
91d574f8ad
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
2019-07-19 15:37:10 +02:00
Enrico Turri
81d3669a25
Undo/Redo buttons moved into their own toolbar
2019-07-19 15:36:55 +02:00
bubnikv
252159e31e
Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer
2019-07-19 15:29:15 +02:00
bubnikv
dbc1918193
Undo / Redo. Workaround for the Wipe tower.
2019-07-19 15:29:04 +02:00
Lukas Matena
eb29c3e01d
Wipe tower accounts for extruder offsets
...
Also, in case of non-single-extruder printer with the wipe tower, first wiping line was printed where the border should have been - fixed
2019-07-19 13:00:10 +02:00
tamasmeszaros
72ed8c034e
Fix for incorrect inside check of fixed items.
...
libnest2d: Add dispatched overloads for offsetting different shapes.
2019-07-19 12:34:27 +02:00
Enrico Turri
37f2362aab
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_custom_bed
2019-07-19 11:36:07 +02:00
Enrico Turri
749bb2bfed
Refactoring in GLTexture
2019-07-19 11:18:19 +02:00
bubnikv
2de6d95322
Memory statistics (total memory, memory usage, Undo / Redo stack size)
...
into the System INfo dialog.
2019-07-19 11:12:38 +02:00
bubnikv
f1f6fe5fb5
Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer
2019-07-19 10:29:17 +02:00
bubnikv
d9c325c7f0
Adding a generic bitmap "flags" attrib to the Undo / Redo snapshot.
...
using this new "flags" attrib to store & recover the "Layers editing active"
flag and restoring the "Layers editing" tool state.
2019-07-19 10:29:06 +02:00
Lukas Matena
fca5562c6c
Process start_filament_gcode in case of usual single extruder printer
...
Reported in https://github.com/prusa3d/PrusaSlicer/issues/2652
2019-07-19 10:02:52 +02:00
Enrico Turri
84d61e28fd
Tech ENABLE_TEXTURES_FROM_SVG set as default
2019-07-19 09:52:01 +02:00
Enrico Turri
3344650255
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_custom_bed
2019-07-19 09:18:32 +02:00
Enrico Turri
ba4bc8ac82
Render custom bed textures in png format on prusa beds
2019-07-19 09:18:09 +02:00
bubnikv
4049f33609
Fix of osx builds
2019-07-18 18:19:40 +02:00
bubnikv
d669a00980
Merge remote-tracking branch 'remotes/origin/master' into vb_undo_redo2
2019-07-18 17:42:10 +02:00
bubnikv
a0ea96968d
Storing the active printer technology onto the Undo / Redo stack,
...
remembering the last selected Printer profile for the SLA and FDM
technologies separately, and activating them on Undo / Redo.
When switching the technologies, user is asked whether to discard
the modified profiles or not.
2019-07-18 17:41:47 +02:00
tamasmeszaros
6ae50a710a
Further refactoring
2019-07-18 17:31:27 +02:00
tamasmeszaros
b2867f9227
Merge branch 'master' into tm_arrange_selection
2019-07-18 16:33:16 +02:00
tamasmeszaros
76b1fbc5bf
Eliminate some igl warnings on msvc
2019-07-18 16:32:04 +02:00
tamasmeszaros
e3ca95152c
Minor refactor
2019-07-18 16:30:32 +02:00
Enrico Turri
1c5ff3c72d
Small refactoring
2019-07-18 15:03:05 +02:00
Enrico Turri
f61d43de07
Render custom bed textures in svg format on prusa beds
2019-07-18 14:39:19 +02:00
bubnikv
631a952f94
Merge remote-tracking branch 'remotes/origin/master' into vb_undo_redo2
2019-07-18 13:08:48 +02:00
tamasmeszaros
6b8c72944d
Merge branch 'master' into tm_arrange_selection
2019-07-18 12:59:40 +02:00
tamasmeszaros
99b8e08e67
Remove arrange cache.
2019-07-18 12:58:28 +02:00
Enrico Turri
af3cb890d1
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_custom_bed
2019-07-18 12:57:12 +02:00
Enrico Turri
de383b1809
Added selection of custom bed model to bed shape dialog
2019-07-18 12:56:52 +02:00
bubnikv
69ef6cf806
Fix for compilation on clang: Forward declarations of templates.
2019-07-18 12:07:50 +02:00
Enrico Turri
44d7462bdb
Partially revert 8febd88e80
2019-07-18 12:03:41 +02:00
bubnikv
cd95b52dcd
Undo / Redo memory conservation strategy: Release recoverable data
...
starting from the objects of lowest ObjectID.
(convex hulls are recoverable as well as the indexed triangle sets
inside the TriangleMeshes or the triangle connectivity information).
Now the top most snapshot (the temp one taken before Undo jump) will
never be released.
2019-07-18 11:51:06 +02:00
Enrico Turri
8febd88e80
Fixed rendering of toolbars' textures with prespective camera
2019-07-18 11:36:17 +02:00
Enrico Turri
1e796b82e1
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_custom_bed
2019-07-18 11:12:30 +02:00
Enrico Turri
08d37aad06
Added selection of custom bed texture to bed shape dialog
2019-07-18 11:12:11 +02:00
tamasmeszaros
6949543912
Fixes after merge with master.
2019-07-17 18:10:08 +02:00
tamasmeszaros
a695dec51a
Merge branch 'master' into tm_arrange_selection
2019-07-17 17:25:31 +02:00
tamasmeszaros
c82fb9c84f
libnest2d: Remove old preload method from selector interface
2019-07-17 17:19:42 +02:00
tamasmeszaros
aff1863aed
Really fix build for msvc
2019-07-17 16:47:09 +02:00
bubnikv
cc1338ce6a
Fix after merge
2019-07-17 16:00:09 +02:00
bubnikv
7176599a34
Merge remote-tracking branch 'remotes/origin/master' into vb_undo_redo2
2019-07-17 15:54:57 +02:00
bubnikv
3a74e7ab69
WIP: Undo / Redo memory limiting by releasing the least recently
...
used snapshots. Memory limit set to 10% of physical system memory.
2019-07-17 15:48:53 +02:00
Lukas Matena
2b9d285a16
'Place on face' gizmo fix (it used invalid pointer after undo/redo was implemented)
2019-07-17 15:39:58 +02:00
Lukas Matena
81dde630ea
SLA support points edits are now pushed onto undo/redo stack
2019-07-17 15:39:58 +02:00
Enrico Turri
75c53a53b6
Refactoring of BedShapePanel and BedShapeDialog
2019-07-17 14:53:02 +02:00
tamasmeszaros
c74e6513d9
Fix for msvc build.
2019-07-17 14:34:28 +02:00
Enrico Turri
ce5618fb27
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_custom_bed
2019-07-17 14:28:12 +02:00
Enrico Turri
f97a61cdcf
Fixed use of translate macros
2019-07-17 14:13:50 +02:00
tamasmeszaros
2728f41123
Solved issue with virtual bed management.
...
libnest2d: Fix for unclosed polygons after merge.
2019-07-17 13:32:31 +02:00
Enrico Turri
ba7df2a64e
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_custom_bed
2019-07-17 13:17:50 +02:00
Enrico Turri
401707a6fe
Another refactoring of GLGizmosManager
2019-07-17 12:43:27 +02:00
Enrico Turri
da1fa0b6e3
Refactoring of GLGizmosXX classes to cleanup their interface
2019-07-17 12:06:23 +02:00
Enrico Turri
0a530ab7bc
Added undo/redo snapshot for layers height editing
2019-07-17 10:03:00 +02:00
Enrico Turri
832dada931
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
2019-07-17 08:38:58 +02:00
Enrico Turri
21624f5305
Framework to serialize gizmos into undo/redo stack
...
Serialization into undo/redo of Cut gizmo
Refactoring of GLGizmosManager
2019-07-17 08:38:48 +02:00
tamasmeszaros
44801f4429
Priority for wipe tower, Increased safety distance from bed edges.
...
* WipeTowerInfo class extended in plater (WipeTower) instead of GLCanvas3D
* Bed origin support in ModelInstance and WipeTower
2019-07-16 18:33:42 +02:00
Lukas Matena
52ab8a5f19
Wipe tower fix (do not skip the first toolchange when printing without the wipe tower)
...
Also, test multi.t updated so it matches new logic of inserting custom gcodes
2019-07-16 13:10:09 +02:00
bubnikv
4865240a9c
Fixed compilation issue
2019-07-16 09:19:00 +02:00
tamasmeszaros
5446167c11
Fixes for arranging wipe tower
2019-07-15 18:18:34 +02:00
tamasmeszaros
1b0e192046
Arrange cache in ModeInstance and logical bed remembered.
2019-07-15 17:30:44 +02:00
Lukas Matena
dc80616bf6
Fixed a use-after-free problem in object list
...
this was uncovered by ASAN when attempting to Delete All objects with multiple instances
2019-07-15 17:09:06 +02:00
bubnikv
72ba890091
Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer
2019-07-15 15:51:31 +02:00
bubnikv
d2a3a36013
Fix of the SLA Undo
2019-07-15 15:51:25 +02:00
Lukas Matena
004e2719b1
Merge branch 'master' into lm_warnings
2019-07-15 13:26:55 +02:00
bubnikv
35b691d28c
Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer
2019-07-15 12:00:10 +02:00
bubnikv
a492360d19
Fix of the merge - missing Undo / Redo toolbar buttons.
2019-07-15 11:59:54 +02:00
Lukas Matena
63cf5edf28
Updated tooltips on custom gcodes to match actual PrusaSlicer behaviour to reflect recent changes
2019-07-15 11:49:30 +02:00
bubnikv
ab7ecc1819
Merge remote-tracking branch 'remotes/origin/vb_undo_redo'
2019-07-15 11:34:18 +02:00
Lukas Matena
e674c586b0
Merge branch 'lm_improving_wipe_tower'. Summary of changes:
...
- wipe tower respects max volumetric flow, slowing down with PVA etc is not hardcoded anymore
- wipe tower is now allowed for multiple-extruder printers. single extruder stuff is not used in that case (ramming, cooling, etc.)
- start/end filament and toolchange custom gcodes are now inserted differently than before - see 41164a9
- some refactoring, e.g. the abstract WipeTower class was eradicated
2019-07-15 10:25:38 +02:00
Enrico Turri
610e0f7ee6
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_custom_bed
2019-07-15 08:19:58 +02:00
YuSanka
44f0e387dc
Fix of #2621
2019-07-13 10:38:10 +02:00
tamasmeszaros
df7bb94daf
Not handling logical beds in arrange()
2019-07-12 21:17:11 +02:00
Enrico Turri
077d4aa3d7
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
2019-07-12 15:36:11 +02:00
Enrico Turri
de88db5918
#2616 - Added Recent projects item to File menu
2019-07-12 15:36:01 +02:00
YuSanka
4d8a028262
Finally fix for settings item selection
2019-07-12 13:56:56 +02:00
YuSanka
6826e31e2a
Some code refactoring for settings items
2019-07-12 13:56:56 +02:00
YuSanka
aed6acc073
Add take_snapshot for layers range editing actions
2019-07-12 13:56:56 +02:00
Lukas Matena
45db42ca3b
Merge branch 'lm_drop_to_bed'
2019-07-12 13:38:18 +02:00
Lukas Matena
2ee572bd31
GCodeAnalyzer now recognizes tool-changing commands with MakerWare and Sailfish flavor
...
These firmwares use M135 Tn and M108 Tn commands for changing active tool, which the analyzer did not recognize. The toolpaths were then rendered in wrong color, extruder offset etc. This surfaced in issue https://github.com/prusa3d/PrusaSlicer/issues/2566
2019-07-12 12:56:41 +02:00
Enrico Turri
cc70c8dff9
Tech ENABLE_SVG_ICONS set as default
2019-07-12 10:13:35 +02:00
Enrico Turri
2f57f756e5
Follow-up of 4c6c608342
-> refactoring
2019-07-12 09:26:19 +02:00
YuSanka
eced3dcea8
Merge remote-tracking branch 'origin/vb_undo_redo' into ys_undo_redo
2019-07-11 16:00:28 +02:00
YuSanka
a6a5b94155
Added suppress_snapshots() and allow_snapshots() for avoid of excess "snapshoting"
2019-07-11 16:00:01 +02:00
Enrico Turri
4c6c608342
GLToolbar and GLToolbarItem refactored to allow two different actions when left/right clicking on items.
...
Stack dialog for undo and redo items is now shown on right click only
2019-07-11 15:29:46 +02:00
Enrico Turri
f964f5e99a
Deactivate undo/redo toolbar items by pressing Esc key
2019-07-11 07:54:33 +02:00
Enrico Turri
dbf0eacfa7
Deactivate undo/redo toolbar items when leaving the 3D scene or clicking into it
2019-07-11 07:46:40 +02:00
YuSanka
5cbaa7b081
FreqChangedParams : workaround for right border alignment
2019-07-10 17:50:24 +02:00
YuSanka
1dc0439a31
Fixed margins for FreqChangedParams
2019-07-10 15:55:53 +02:00
Enrico Turri
1b5ab100bd
GLToolbar::m_imgui_hovered_pos replaced with GLCanvas3D::m_imgui_undo_redo_hovered_pos
2019-07-10 14:08:14 +02:00
Enrico Turri
14dad5039a
Imgui dialogs for undo/redo centered on their toolbar item icon
2019-07-10 13:45:25 +02:00
Enrico Turri
40a1f31e84
Disable remaining toolbar items when one of them is toggable and pressed
2019-07-10 11:59:25 +02:00
YuSanka
baece78390
Merge remote-tracking branch 'origin/vb_undo_redo' into ys_undo_redo
2019-07-10 11:38:52 +02:00