3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,140 Commits 1 Branch 1 Tag 249 MiB
67f55d3b23
Commit Graph

740 Commits

Author SHA1 Message Date
tamasmeszaros
c37ec7463f Add new config values to SL1 zip file config.ini 
All requested config values are written into SL1 ini file inside the zip

* TIme.hpp and Time.cpp is now part of libslic3r instead of libslic3r_gui
* Updated time manipulation function: separate timestamp_local_str and timestamp_utc_str
* timestamp_utc_str is used in header_slic3r_generated(). Gcode now contains UTC timestamps
 2019-09-11 13:10:23 +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
Lukas Matena
86b258f727 Fixed many warnings in following files: 
src/slic3r/Config/Snapshot.cpp
src/slic3r/GUI/Field.cpp
src/slic3r/GUI/GLToolbar.cpp
src/slic3r/GUI/GUI_ObjectList.cpp
src/slic3r/GUI/GUI_ObjectList.hpp
src/slic3r/GUI/Plater.cpp
src/slic3r/GUI/Plater.hpp
src/slic3r/GUI/PresetBundle.cpp
src/slic3r/GUI/Tab.cpp
src/slic3r/GUI/wxExtensions.cpp
 2019-09-10 12:08:43 +02:00
Enrico Turri
27f01bb09e Fixed instance printable property after reload from disk 2019-09-10 11:16:59 +02:00
bubnikv
6ba43ebacb Merge remote-tracking branch 'remotes/origin/master' into dev 2019-09-09 17:49:07 +02:00
Enrico Turri
6507b7bf39 Fixed gizmos update after objects loading 2019-09-09 15:55:04 +02:00
Enrico Turri
e6366894da Fixed object settings after reload from disk 2019-09-06 17:26:08 +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
YuSanka
c960c2cf27 Code clean in Tab.cpp and Fixed couple of Mac-warnings in : 
GUI.cpp
GUI_App.cpp
GUI_ObjectList.cpp
MainFrame.hpp
Plater.cpp
PresetBundle.cpp
PresetHints.cpp
Tab.cpp
Tab.hpp
wxExtensions.cpp
wxExtensions.hpp
 2019-09-03 10:29:17 +02:00
Lukas Matena
7d54b04699 Merge branch 'lm_wiping_dialog_colors' into dev 2019-09-02 16:31:22 +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
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
bubnikv
2b7a4973a8 Reworded the "Add / remove instance / set number of instances". 2019-08-28 15:35:01 +02:00
bubnikv
048ed74318 Another round of translation adjustments. 2019-08-28 15:12:55 +02:00
tamasmeszaros
c2b9980488 Mirror pad_around_object for 'Pad' page on 'Supports' page 2019-08-28 11:33:04 +02:00
bubnikv
86b2817da5 Fix of a regression issue since ee38d80318 
1) load object
2) Switch FFF to SLA or vice versa
3) Undo -> Crash

Fixed by deselecting the side panel before loading profiles
of the other technology.
 2019-08-27 12:15:29 +02:00
bubnikv
1e11eab620 Improved wording of some UI texts and tooltips. 2019-08-27 11:39:51 +02:00
YuSanka
8f019e5fa9 Set bigger scroll step for sidebar 2019-08-23 16:05:18 +02:00
bubnikv
6adebb9c78 When synchronizing the front end with the back end after Undo / Redo 
jump, postpone error messages, so they are displayed after
the Undo / Redo jump has been fully performed.
Otherwise there would be a message box opening, taking over the message
queue, and possibly performing actions as rendering on an inconsistent
application state.
 2019-08-23 15:53:45 +02:00
YuSanka
6b4f6f43dd Merge remote-tracking branch 'origin/master' into lm_wiping_dialog_colors 2019-08-23 14:27:25 +02:00
bubnikv
93c6915e9d Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer 2019-08-23 13:26:47 +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
Lukas Matena
52933d1bab Recalculate SLA supports after undo/redo in case SLA gizmo was active and had supports when the snapshot was taken 2019-08-23 01:42:59 +02:00
Lukas Matena
b55a140ad4 SLA gizmo takes snapshots on opening and closing 2019-08-23 01:42:59 +02:00
bubnikv
c6604ff55d Merge remote-tracking branch 'remotes/origin/et_toolpaths_export' 2019-08-22 15:02:02 +02:00
YuSanka
448d773da0 Fixed default transparency for ColorPicker from sidebar (was appeared under OSX for empty extruder color). 
+ Fixed wrong getting of instance printable value inside add_object_to_list()
 2019-08-20 15:27:51 +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
YuSanka
7706a5be3e Fixed #2738 
+ Added update for plater config option "filament_colour", when we have multiple extruder print.
 2019-08-20 09:52:01 +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
YuSanka
0a9c5a9433 Fixed extra "Add_Selection" snapshot on call context menu from scene 
+ Added take_snapshot for toggle_instance_printable_state
 2019-08-09 09:49:10 +02:00
bubnikv
23b2b4c59f Merge remote-tracking branch 'remotes/origin/vb_picking_fix' 2019-08-08 09:50:02 +02:00
tamasmeszaros
b8bfe001c0 WIP: Pad quick-menu 2019-08-06 18:16:02 +02:00
YuSanka
8a2362587d Save/load printable flag to/from 3mf and amf 2019-08-06 16:27:56 +02:00
YuSanka
0520da3241 Merge remote-tracking branch 'origin' into ys_printable_property 2019-08-06 10:31:17 +02:00
YuSanka
b43f7c3880 Generated new POT-file 
Fixed lines with translation of the empty strings
 2019-08-06 10:01:10 +02:00
bubnikv
cf2f16d864 Fixed Model::convert_multipart_object() for STLs (regression from 8e2af5151dcf6f102b65981ff5aa56c2dfda5a2a). 
Removed Model::s_auto_extruder_id and related, as it is a Perl interfacing legacy.
Fixed a typo in asserts introduced in the preceding commit.
 2019-08-05 17:49:21 +02:00
YuSanka
825446d145 Merge remote-tracking branch 'origin/master' into ys_printable_property 2019-08-05 08:45:47 +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
YuSanka
885da35544 Merge remote-tracking branch 'origin/master' into ys_printable_property 2019-08-01 15:15:18 +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
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
bubnikv
ca1c78b3fc Merge remote-tracking branch 'remotes/origin/et_custom_bed' 2019-07-30 16:48:47 +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
e8c38a93fc Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_custom_bed 2019-07-26 09:45:42 +02:00
YuSanka
99bd054e99 Fixed updating of an option list for additional settings 2019-07-25 17:25:14 +02:00
YuSanka
77401ed79d Upgrade for ModeButtons 2019-07-25 16:23:32 +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
1483a7fd51 Render custom bed model on prusa beds 2019-07-24 14:02:36 +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
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
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
3fe355509c Fixed undo/redo snapshot when opening a project using the recent files list 2019-07-23 12:57:58 +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
Enrico Turri
c1dee0e87d Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_custom_bed 2019-07-22 11:26:02 +02:00
tamasmeszaros
dcb073d4fd Merge branch 'tm_arrange_selection' 2019-07-22 11:14:34 +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
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
dbc1918193 Undo / Redo. Workaround for the Wipe tower. 2019-07-19 15:29:04 +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
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
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
Enrico Turri
3344650255 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_custom_bed 2019-07-19 09:18:32 +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
e3ca95152c Minor refactor 2019-07-18 16:30:32 +02:00
Enrico Turri
f61d43de07 Render custom bed textures in svg format on prusa beds 2019-07-18 14:39:19 +02:00
tamasmeszaros
a695dec51a Merge branch 'master' into tm_arrange_selection 2019-07-17 17:25:31 +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
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
401707a6fe Another refactoring of GLGizmosManager 2019-07-17 12:43:27 +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
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
bubnikv
ab7ecc1819 Merge remote-tracking branch 'remotes/origin/vb_undo_redo' 2019-07-15 11:34:18 +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
de88db5918 #2616 - Added Recent projects item to File menu 2019-07-12 15:36:01 +02:00