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

1488 commits

This branch
This branch
All branches
Author SHA1 Message Date
larsbrubaker
a6493af42a Made the background a bit translucent. 2014-12-14 23:30:44 -08:00
larsbrubaker
2ee6902414 Draw the arrow on the end of the measuer line 2014-12-14 23:24:45 -08:00
larsbrubaker
fc24408e7e Fixed a bug with the top left corner (0 index) getting the focus. 2014-12-14 14:25:13 -08:00
larsbrubaker
394c9393be turn back on the new ui stuff. 2014-12-14 12:55:33 -08:00
larsbrubaker
bbb5349486 Going to work on the new ui stuff in a separate fork. 2014-12-14 12:53:19 -08:00
larsbrubaker
1e4cb18312 Made the Draw event clearer. 
Made a DrawBefore and DrawAfter Handler and made the params clearer.
Made switching to simple mode work.
Made simple mode get the right initial state from oem settings.
 2014-12-14 11:46:24 -08:00
larsbrubaker
8132713296 Draw the measurement bars when changing z. 2014-12-14 08:11:57 -08:00
larsbrubaker
099eadeb93 Fixed some visibility timing issues. 2014-12-14 07:34:50 -08:00
larsbrubaker
03085d0371 Making the height edit value be an object. 
Starting to hook it up instead of having this code on the up arrow.
 2014-12-13 23:25:08 -08:00
larsbrubaker
4c8ae06b5b Working on improving the z edit control. 
Adding number input
 2014-12-12 21:57:05 -08:00
larsbrubaker
a35e912c58 Moved the save button a bit.. 2014-12-12 20:41:01 -08:00
Lars Brubaker
cce96f03ff Trying to clean up the interface for setting the interface mode. 2014-12-12 16:07:48 -08:00
Lars Brubaker
cb3bca22ea Merge branch '1.1.4' into development 
Conflicts:
	PrinterControls/TerminalWindow/TextScrollWidget.cs
 2014-12-12 15:14:41 -08:00
Lars Brubaker
be573de351 and make the logic correct. 2014-12-12 15:07:44 -08:00
Lars Brubaker
3e80571f70 Fixed a bug with filtering on repatier firmware. 2014-12-12 14:20:26 -08:00
Lars Brubaker
4719e71272 Fixed a bug with filtering on repatier firmware. 2014-12-12 14:19:43 -08:00
Lars Brubaker
47fed001ec Made the save button be on the edit bar. 
Made the up arrow cause save to show.
 2014-12-12 12:57:44 -08:00
larsbrubaker
7ffdbcbba8 Put in a z height snap grid of 1. Will make a menu in the future. 2014-12-12 07:34:25 -08:00
Lars Brubaker
dcb288ddef Merge branch '1.1.4' into development 2014-12-11 18:14:00 -08:00
Lars Brubaker
182191a464 Put in the right driver for Me3D 2014-12-11 18:07:25 -08:00
Lars Brubaker
3d8d19185a Merge pull request #122 from gregory-diaz/1.1.4 
New slice config files for Me3D
 2014-12-11 18:04:03 -08:00
Lars Brubaker
3c41775a54 Making the Standard and Advanced ui control work and be available. 2014-12-11 17:35:57 -08:00
Gregory Diaz
d29ad1a80e New slice config files for Me3D 2014-12-11 17:32:08 -08:00
Lars Brubaker
538bb6abdc Fixed a bug with adding gcode to the library. 
Made drag and drop to the library add it correctly to the library folder when needed.
 2014-12-11 17:19:32 -08:00
Lars Brubaker
806fde6512 Merge pull request #121 from gregory-diaz/development 
new slice settings, material and quality settings for Me3D
 2014-12-11 15:52:18 -08:00
Gregory Diaz
d93a86c450 new slice settings, material and quality settings for Me3D 2014-12-11 15:21:24 -08:00
Lars Brubaker
9849a1871a Faster trace data 2014-12-11 11:31:07 -08:00
Lars Brubaker
cd1a9c5833 Fixed a bug importing new slic3r ini files. 2014-12-11 09:56:03 -08:00
Lars Brubaker
46e7d6c2f1 Made bed image load through static data. 2014-12-10 12:27:24 -08:00
Lars Brubaker
834f090ea9 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-12-10 12:07:16 -08:00
Lars Brubaker
ccbdde24b7 Made the replacement strings for gcode happen in macros and pause resume. 2014-12-10 12:07:06 -08:00
Lars Brubaker
58d33dd0b4 Merge pull request #119 from jlewin/ImportRefactor 
Import project refactoring
 2014-12-10 11:21:31 -08:00
John Lewin
6ffb66a7ca Import project refactoring 2014-12-10 11:03:07 -08:00
larsbrubaker
f4aaa5107f Moved some bools to enums to make the code more readable. 2014-12-10 08:18:42 -08:00
Lars Brubaker
0b934dcc52 Made the default size bigger. 
Fixed a problem on starting first time (new to this build)
 2014-12-09 17:53:15 -08:00
Lars Brubaker
220b386a26 Cleaning up some interfaces 2014-12-09 16:40:52 -08:00
Lars Brubaker
a54a59e25f Putting a menu to switch view settings. 
Made the trace data build faster.
Made ungroup understand mesh collections better
Made the slice settings layer index be an enum so it is clearer what is being accessed
Put menu items into separate files
 2014-12-09 15:16:08 -08:00
Lars Brubaker
de0070eb35 Some working on streamlining the ui and creating a new 'simple' mode. 2014-12-08 18:18:38 -08:00
Lars Brubaker
59cb80f894 Put in a description. 2014-12-08 16:46:23 -08:00
Lars Brubaker
0b22f099e7 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-12-08 16:40:56 -08:00
Lars Brubaker
f8e92931e1 Made the pre-heat use the temperature and bed_temperature . 
Put in a menu to select the slice settings level.
 2014-12-08 16:40:50 -08:00
Lars Brubaker
56d156f62a Merge pull request #117 from jlewin/development 
Drop SharpZipLib and refactor for System.IO.Compression
 2014-12-08 16:03:47 -08:00
John Lewin
891c03deae Remove compiled assemblies from project root 2014-12-08 13:09:29 -08:00
John Lewin
10dfe6ec8c Drop SharpZipLib and refactor for System.IO.Compression 2014-12-08 13:08:09 -08:00
Lars Brubaker
c0e878a45d Fixe the e speed for SeeMeCNC in 1.1.4 2014-12-08 10:44:43 -08:00
larsbrubaker
527757b314 Put in a z-height display. 2014-12-08 07:53:10 -08:00
larsbrubaker
d94ab42f24 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-12-08 07:25:12 -08:00
larsbrubaker
6d4320983b Improved the z axis movement plane 
Made the skirt values have a menu
 2014-12-08 07:25:02 -08:00
kevinepope
1a1d505b14 Added custom progress bar control. 2014-12-07 20:10:24 -08:00
larsbrubaker
4ef5f15d03 Put upArrow3D into its own file. 2014-12-07 08:05:31 -08:00