nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
166 commits 1 branch 0 tags 103 MiB
Commit graph

166 commits

This branch
This branch
All branches
Author SHA1 Message Date
larsbrubaker
30ba01ddab Merge remote-tracking branch 'origin/development' into development 2014-03-11 11:09:50 -07:00
larsbrubaker
ab0950e0d0 Merge branch '1.0.5' into development 
Conflicts:
	MatterControl.csproj
 2014-03-11 11:09:38 -07:00
larsbrubaker
9d600947d1 Putting in layer render partial slider 2014-03-11 10:41:39 -07:00
larsbrubaker
f7e5d0f64b Merge remote-tracking branch 'Chaz/master' into 1.0.5 2014-03-10 10:59:19 -07:00
csselph
09c4788a44 Corrected Orion ABS temperature settings in Slice Configuration file 2014-03-08 15:22:52 -08:00
larsbrubaker
a4d41acfd0 Fixed a terrible problem with the gcode parsing that resulted in print leveling not working. 
Made the not printing commands also go through bed leveling when enabled.
 2014-03-07 16:09:07 -08:00
larsbrubaker
fd0db7b991 Don't show the part sheet menu on the mac (the pdf library is not working on mac). 2014-03-07 15:21:21 -08:00
larsbrubaker
411cde9414 Merge remote-tracking branch 'origin/1.0.5' into 1.0.5 
Conflicts:
	PartsSheet.cs
 2014-03-07 14:50:13 -08:00
larsbrubaker
24042e9a34 Just adding some comments for clarity. 2014-03-07 14:46:23 -08:00
Kevin Pope
e3c5924ef2 Made save dialogs for pdf import/export Mac compatible. 2014-03-07 11:06:59 -08:00
larsbrubaker
8750be422e Took out Iconic.Zip.dll 
Put in ICSharpCode.SharpZipLib.dll
 2014-03-07 10:12:55 -08:00
larsbrubaker
041bd7f599 Put in more copy write notices 
Took out Iconic.Zip.dll
Put in ICSharpCode.SharpZipLib.dll
put the add button next to the edit button in the 3d view controls.
Made web request handler work on a background task rather than a thread
 2014-03-07 09:50:41 -08:00
larsbrubaker
db8ff174c2 Merge remote-tracking branch 'origin/development' into development 2014-03-05 21:04:32 -08:00
larsbrubaker
f52eae0f33 Merge branch '1.0.5' of https://github.com/MatterHackers/MatterControl into development 2014-03-05 21:04:28 -08:00
larsbrubaker
26d2730516 Fixing some errors with exporting gcode to a folder when the STL not present. 2014-03-05 13:45:07 -08:00
Kevin Pope
9238fbdf97 Merge branch '1.0.5' of https://github.com/MatterHackers/MatterControl into 1.0.5 2014-03-05 12:17:17 -08:00
Kevin Pope
5e96cc9b5d Added named widget to ManualPrinterControls 
Added firmware check to PrinterCommunication
Added event hook to MainSlidePanel for reload of Advanced Controls
 2014-03-05 12:16:52 -08:00
larsbrubaker
a035aed52e Fixed a bug with export to folder not working if done a second time. 
Made the slicing queue report its status on the uithread.
 2014-03-05 12:00:37 -08:00
larsbrubaker
66675ff2b4 And the project file didn't save until I built it again. 2014-03-05 10:35:41 -08:00
larsbrubaker
0cebab830a Moved frosted serial into agg 
changed some namespaces
 2014-03-05 10:33:19 -08:00
larsbrubaker
1ea4162948 the interface in gcode changed and this is just to keep in synch with it. 2014-03-04 13:42:30 -08:00
larsbrubaker
1e5e8d672a Deleted a bunch of OnMouse code that did not add value. 
Merge remote-tracking branch 'origin/1.0.5' into development

Conflicts:
	PartPreviewWindow/GcodeViewBasic.cs
 2014-03-04 07:32:11 -08:00
Kevin Pope
82740d3222 Merge branch '1.0.5' of https://github.com/MatterHackers/MatterControl into 1.0.5 2014-03-03 16:32:21 -08:00
Kevin Pope
48e68b9f8e Fixed issue where bed temperature and extruder temperature were not being set to zero. 2014-03-03 16:31:51 -08:00
larsbrubaker
370ee8c86d Making sure we are releasing some EventHandlers so we don't hold onto memory. 2014-03-03 15:50:23 -08:00
Kevin Pope
2cf0fa8ad9 Updated R3D support material threshold from 30 degrees to 40 degrees. 2014-03-03 11:42:22 -08:00
larsbrubaker
f15b8c31aa Merge branch 'development-kp' into development 2014-03-03 10:15:26 -08:00
larsbrubaker
841ddc2a2c Using the new GetFirstNumberAfter interface in GCodeFile 2014-03-03 10:15:21 -08:00
larsbrubaker
afc8d156fd Got more of the new layout code not crashing. 
Sped up gcode parsing a bit (almost back to what it was).
 2014-03-03 08:03:23 -08:00
larsbrubaker
621f91f4e1 Always show memory display in debug. 2014-03-02 17:01:49 -08:00
larsbrubaker
e3c70b0268 Removed all the internal performance monitoring in favor of an external tool. 2014-03-02 15:28:47 -08:00
larsbrubaker
5f364b4db7 Don't know how I left this (edited during debug?). 2014-03-01 23:30:19 -08:00
larsbrubaker
f2b11e2a33 Merge remote-tracking branch 'origin/development-kp' into development 
Conflicts:
	PrinterControls/ManualPrinterControls.cs
 2014-03-01 23:27:34 -08:00
larsbrubaker
242b38bd13 Made the thumbnail thread a background task rather than a thread so that it will free the memory used when creating the thumbnail when done. 2014-03-01 22:28:27 -08:00
kevinepope
7509b39799 Made right column hide-able. 2014-03-01 19:43:54 -08:00
kevinepope
92096291bc Stylistic exploration. 2014-03-01 18:48:25 -08:00
kevinepope
caa4da6dc6 More widescreen fixes. 2014-03-01 17:52:33 -08:00
Kevin Pope
722545fd46 Modifications to MainSlidePanel to allow Widescreen view. 2014-03-01 16:34:33 -08:00
Kevin Pope
d3c8c3ad45 PrintitemWrapper now handles empty path. 2014-03-01 16:33:41 -08:00
Kevin Pope
7f1a7c0e8e Fixed copyright message. 2014-03-01 16:31:38 -08:00
larsbrubaker
7e03ee8dfb Only enable eeprom after connected. 2014-03-01 15:02:00 -08:00
Kevin Pope
04e3223d2c Revert solution file. 2014-03-01 13:19:26 -08:00
Kevin Pope
ebcbd37b67 Removed eeprom and print leveling from manual controls page. 2014-03-01 13:18:37 -08:00
Kevin Pope
8ab9f15a70 Refactoring and cleanup. Added new separate tab for configuration actions. 2014-03-01 13:10:48 -08:00
larsbrubaker
f357f69da8 Made a distinction between load and load in background for GCodeViewer and made PartPreviewWindow call background. 2014-03-01 08:06:43 -08:00
larsbrubaker
c7ac37a5cb Make sure we output g11 and g10 commands correctly. 
Put in spaces when outputting leveled GCode (export)
 2014-02-28 14:12:19 -08:00
larsbrubaker
32fb2605e5 Make the release build compile with the new command line stuff. 2014-02-27 18:26:19 -08:00
larsbrubaker
498ef7865d Make sure we add the extension to the member variable so that we can have it when we are done slicing to save the gcode. 2014-02-27 16:58:29 -08:00
larsbrubaker
d72836f3a0 Make sure we don't keep a reference around to widgets through the OnIdle call back. 2014-02-27 16:41:52 -08:00
larsbrubaker
5f72d64f73 Put in more command line options to turn on features like memory tracking and gc collection. 2014-02-27 14:56:20 -08:00