Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								835ee148e5 
								
							 
						 
						
							
							
								
								Fixed conflicts after merging with master  
							
							
							
						 
						
							2019-10-09 11:17:48 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								8aa33a9e05 
								
							 
						 
						
							
							
								
								ENABLE_3DCONNEXION_DEVICES -> Hack for filtering out mouse wheel events coming from 3Dconnexion driver  
							
							
							
						 
						
							2019-10-08 08:44:50 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Vojtech Kral 
								
							 
						 
						
							
							
							
							
								
							
							
								fd6d32135b 
								
							 
						 
						
							
							
								
								Merge branch 'master' into materials  
							
							
							
						 
						
							2019-10-07 17:23:37 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								243cb5d524 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/prusa3d/PrusaSlicer  into et_3dconnexion  
							
							
							
						 
						
							2019-10-04 07:34:43 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Vojtech Kral 
								
							 
						 
						
							
							
							
							
								
							
							
								eb93d2a32d 
								
							 
						 
						
							
							
								
								Merge branch 'master' into materials  
							
							
							
						 
						
							2019-09-30 16:12:48 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								eabaa21df2 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/prusa3d/PrusaSlicer  into et_3dconnexion  
							
							
							
						 
						
							2019-09-30 15:19:21 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									YuSanka 
								
							 
						 
						
							
							
							
							
								
							
							
								c07a193b4e 
								
							 
						 
						
							
							
								
								Implemented BitmapChoiseRenderer  
							
							
							
						 
						
							2019-09-30 14:34:29 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									YuSanka 
								
							 
						 
						
							
							
							
							
								
							
							
								904bbcc006 
								
							 
						 
						
							
							
								
								Fix of SPE-1035 (Wrong filament color updating for multi-material print)  
							
							
							
						 
						
							2019-09-30 13:59:26 +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 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									YuSanka 
								
							 
						 
						
							
							
							
							
								
							
							
								82bc243281 
								
							 
						 
						
							
							
								
								Implemented possibility to set a resin cost  
							
							
							
						 
						
							2019-09-26 16:36:31 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								2dc9949a4c 
								
							 
						 
						
							
							
								
								ENABLE_ENHANCED_RELOAD_FROM_DISK set as default  
							
							
							
						 
						
							2019-09-23 15:35:49 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								c0576a8770 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/prusa3d/PrusaSlicer  into et_reload_from_disk  
							
							
							
						 
						
							2019-09-23 08:27:01 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									YuSanka 
								
							 
						 
						
							
							
							
							
								
							
							
								584b37513f 
								
							 
						 
						
							
							
								
								Implemented possibility to create "shape" as an object ( #2865 )  
							
							
							
						 
						
							2019-09-19 12:30:16 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									bubnikv 
								
							 
						 
						
							
							
							
							
								
							
							
								80c5eaacdf 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev' into vk-materials  
							
							
							
						 
						
							2019-09-19 11:49:49 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								3a40565d03 
								
							 
						 
						
							
							
								
								Added tech ENABLE_ENHANCED_RELOAD_FROM_DISK  
							
							... 
							
							
							
							1) Reworked void Plater::priv::reload_from_disk() to be more general
2) Added source data to class ModelVolume
3) Modified .3mf import/export to save/load volume matrices and source data
4) Incremented .3mf version to 2 
							
						 
						
							2019-09-19 09:09:11 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Lukas Matena 
								
							 
						 
						
							
							
							
							
								
							
							
								741e98804c 
								
							 
						 
						
							
							
								
								Purging volumes dialog now uses filament colour in case extruder color is undefined  
							
							
							
						 
						
							2019-09-18 11:47:19 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Vojtech Kral 
								
							 
						 
						
							
							
							
							
								
							
							
								dba9925c4e 
								
							 
						 
						
							
							
								
								Move ConfigWizard instance in GUI_App, lazy-initialized,  
							
							... 
							
							
							
							add filament/material installation item in Sidebar combo boxes 
							
						 
						
							2019-09-17 13:20:06 +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 
								
							 
						 
						
							
							
							
							
								
							
							
								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 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
								
							 
						 
						
							
							
							
							
								
							
							
								1f6aab312b 
								
							 
						 
						
							
							
								
								1st installment of export of gcode toolpaths to obj file  
							
							
							
						 
						
							2019-08-20 09:01:09 +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 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									enricoturri1966 
								
							 
						 
						
							
							
							
							
								
							
							
								b60b44ed5e 
								
							 
						 
						
							
							
								
								Added additional tooltip to toolbar items and use it for undo/redo items  
							
							
							
						 
						
							2019-07-20 14:03:34 +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 
								
							 
						 
						
							
							
							
							
								
							
							
								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 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
								
							 
						 
						
							
							
							
							
								
							
							
								a6a5b94155 
								
							 
						 
						
							
							
								
								Added suppress_snapshots() and allow_snapshots() for avoid of excess "snapshoting"  
							
							
							
						 
						
							2019-07-11 16:00:01 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									YuSanka 
								
							 
						 
						
							
							
							
							
								
							
							
								f985f5190c 
								
							 
						 
						
							
							
								
								Completed undo/redo from a toolbar  
							
							
							
						 
						
							2019-07-09 20:45:00 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									YuSanka 
								
							 
						 
						
							
							
							
							
								
							
							
								1347e655c2 
								
							 
						 
						
							
							
								
								Next improvements of an undo/redo from a toolbar  
							
							
							
						 
						
							2019-07-09 19:39:36 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									YuSanka 
								
							 
						 
						
							
							
							
							
								
							
							
								7b6229289d 
								
							 
						 
						
							
							
								
								Added undo/redo to the "Edit" menu  
							
							
							
						 
						
							2019-07-08 10:57:35 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									bubnikv 
								
							 
						 
						
							
							
							
							
								
							
							
								c7cc760067 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into vb_undo_redo  
							
							
							
						 
						
							2019-07-04 20:22:15 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									bubnikv 
								
							 
						 
						
							
							
							
							
								
							
							
								5a2ace1a6e 
								
							 
						 
						
							
							
								
								WIP Undo / Redo: First Undo in the history of PrusaSlicer!  
							
							
							
						 
						
							2019-07-04 10:45:41 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									bubnikv 
								
							 
						 
						
							
							
							
							
								
							
							
								5e846112ee 
								
							 
						 
						
							
							
								
								WIP UndoRedo: Added Undo/Redo stack, added Platter::take_snapshot(),  
							
							... 
							
							
							
							experimental snapshots on loading STLs and increasing / decreasing
model instances. 
							
						 
						
							2019-07-02 16:42:23 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								90daffccf2 
								
							 
						 
						
							
							
								
								View dependent order of rendering for layers editing visual hints to keep the correct transparency  
							
							
							
						 
						
							2019-07-02 15:49:18 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									YuSanka 
								
							 
						 
						
							
							
							
							
								
							
							
								1525a864c5 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into ys_new_features  
							
							
							
						 
						
							2019-06-26 13:33:05 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									YuSanka 
								
							 
						 
						
							
							
							
							
								
							
							
								ac82cbe0cc 
								
							 
						 
						
							
							
								
								Fix of  #2548  
							
							
							
						 
						
							2019-06-26 09:48:52 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									YuSanka 
								
							 
						 
						
							
							
							
							
								
							
							
								daac165a44 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into ys_new_features  
							
							
							
						 
						
							2019-06-24 13:56:35 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								7aaba25520 
								
							 
						 
						
							
							
								
								Do not allow to copy/paste volumes when using sla printer  
							
							
							
						 
						
							2019-06-24 13:21:05 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									bubnikv 
								
							 
						 
						
							
							
							
							
								
							
							
								27459a9072 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/prusa3d/PrusaSlicer  
							
							
							
						 
						
							2019-06-20 16:15:26 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									tamasmeszaros 
								
							 
						 
						
							
							
							
							
								
							
							
								d60ecb3788 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into tm_ui_jobs  
							
							
							
						 
						
							2019-06-18 12:16:24 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									YuSanka 
								
							 
						 
						
							
							
							
							
								
							
							
								765d4264ae 
								
							 
						 
						
							
							
								
								Implemented ObjectLayers class  
							
							... 
							
							
							
							+ some code refactoring 
							
						 
						
							2019-05-28 16:38:04 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								bf9740188a 
								
							 
						 
						
							
							
								
								Code cleanup  
							
							
							
						 
						
							2019-05-24 15:22:27 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								c92940c985 
								
							 
						 
						
							
							
								
								Fixed conflicts after cherry-picking  844e99f84e 
							
							
							
						 
						
							2019-05-24 14:42:46 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								d0fd8a4a29 
								
							 
						 
						
							
							
								
								Follow-up of  f54fd10897 -> 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 
								
							 
						 
						
							
							
							
							
								
							
							
								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 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									YuSanka 
								
							 
						 
						
							
							
							
							
								
							
							
								d8d211cb67 
								
							 
						 
						
							
							
								
								Code refactoring for Bind(wxEVT_UPDATE_UI) universally (inside append_menu_item(...))  
							
							... 
							
							
							
							+ Marked text for "Change part type" list 
							
						 
						
							2019-05-13 14:27:51 +02:00