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

380 commits

This branch
This branch
All branches
Author SHA1 Message Date
Kevin Pope
321a3fd4d5 Added 'copy', 'import', and 'export' function to slice presets. 2014-04-10 16:41:48 -07:00
Kevin Pope
96ea37f86f Changed slice config extension (for export) to ".slice" 2014-04-10 16:38:18 -07:00
Kevin Pope
141c51b520 Made slice presets tie to PrinterProfile 2014-04-10 16:37:39 -07:00
larsbrubaker
2c391b8780 Don't show close box on wide screen view of 3d view and gcode view 2014-04-09 21:47:00 -07:00
Kevin Pope
7b76f45f44 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-04-09 18:46:12 -07:00
Kevin Pope
0a57376804 Added lockout overlay to overridden slice settings. Added ability to open specific slice preset detail editor directly. 2014-04-09 18:45:29 -07:00
larsbrubaker
7629750e02 Fixed a stupid problem with adding instructions to the queue. 2014-04-09 16:53:08 -07:00
larsbrubaker
0bde3b14e4 Set the background color before we ShowAsSystemWindow so that it doesn't start out as a black window. 2014-04-09 14:11:00 -07:00
larsbrubaker
1afc7feefc Cleaning up theme related stuff. 
Made save and save as fit better.
 2014-04-09 12:33:43 -07:00
larsbrubaker
8965a2d679 Merge remote-tracking branch 'Greg/master' into development 2014-04-09 11:17:49 -07:00
larsbrubaker
a1d5ae0ed1 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-04-09 11:15:56 -07:00
larsbrubaker
3a4060186b Making it a bit clearer. 
Reversed the queue <-> library default locations
 2014-04-09 11:15:02 -07:00
gregory-diaz
ce9e3ec3ff Merge remote-tracking branch 'upstream/development' 
Conflicts:
	PrintQueue/PartsSheet.cs
 2014-04-09 10:22:16 -07:00
gregory-diaz
c9b66d0d32 commit to merge 2014-04-09 10:21:22 -07:00
Kevin Pope
7309ce8fd9 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-04-09 10:13:33 -07:00
Kevin Pope
8f906c04b7 Fixed bug wherein new slice presets weren't saving their settings. 2014-04-09 10:12:25 -07:00
Kevin Pope
dda7632d9b Added validation and error handling around material/quality preset selections. 2014-04-09 10:11:55 -07:00
kevinepope
c57052ad38 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-04-08 21:53:57 -07:00
kevinepope
c6dd720200 Visual adjustments - slice presets editor 2014-04-08 21:04:58 -07:00
kevinepope
14c92d2314 Enable Quality slice presets. 2014-04-08 21:04:28 -07:00
kevinepope
1c71840941 Visual adjustments to print history. 2014-04-08 21:04:05 -07:00
larsbrubaker
74373014e4 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-04-08 20:57:10 -07:00
larsbrubaker
743bfb0194 Made modifications of the queue save the changes when they make them 
made 'save as' work in editing.
 2014-04-08 20:57:00 -07:00
kevinepope
bdc0cc4ad9 Visual adjustment to tuning controls. 2014-04-08 20:47:48 -07:00
Kevin Pope
a40e2ddb94 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-04-08 19:33:45 -07:00
Kevin Pope
2e418fd48d Lots of work on Slice Presets. 2014-04-08 19:33:09 -07:00
larsbrubaker
4ea0c4d680 You can't pass a foreach interator to a link function or it will only have the last value. 
The solution is to make a local copy in a local variable and use that.
 2014-04-08 19:06:14 -07:00
larsbrubaker
747f9fffea made plating and saving much faster by ensuring the mesh in sorted and merged after it is all constructed. 2014-04-08 18:58:34 -07:00
gregory-diaz
21cc98aab5 Added 'Cancel' button on the export stl/gcode window in print queue 2014-04-08 18:30:09 -07:00
larsbrubaker
8f05c2416a Don't delete part sheet. 2014-04-08 17:31:54 -07:00
larsbrubaker
c1a1b03878 Merge remote-tracking branch 'Greg/master' into development 2014-04-08 17:22:53 -07:00
larsbrubaker
ac650397a6 Made new text wrapping class. 2014-04-08 17:22:03 -07:00
gregory-diaz
3901b6a8a9 Set minimum size on edit leveling settings window. 2014-04-08 15:00:46 -07:00
gregory-diaz
2f956ab1cf Changed text on the part sheet feedback window from light text theme to dark 2014-04-08 14:39:40 -07:00
gregory-diaz
ee9e90c2ea Set minimum sizes for widows that did not previously have them. 2014-04-08 13:22:33 -07:00
gregory-diaz
546fb18a96 Re-added skip connection option on "Setup Printer Connection" window. I might add adjustments later but it looks good and works now. 2014-04-08 12:50:26 -07:00
gregory-diaz
d4dbf43d95 All controls are now visible on the 'manual controls' window (even when window is minimized). 2014-04-08 10:54:12 -07:00
gregory-diaz
3603b4259d Merge remote-tracking branch 'upstream/development' 2014-04-08 10:42:28 -07:00
gregory-diaz
14396d7d29 fixed gui on manual controls window 2014-04-08 10:42:20 -07:00
Kevin Pope
85f726f016 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-04-07 18:54:14 -07:00
Kevin Pope
832c503171 More work on SlicePresets. 2014-04-07 18:53:55 -07:00
larsbrubaker
532f2f453e run poly tests first so I can debug faster. 2014-04-07 18:28:47 -07:00
larsbrubaker
2c1db7a661 Made setting minimum size of a system window work correctly. 2014-04-07 16:15:22 -07:00
larsbrubaker
e6f3174694 Put the entire inject gcode into a lock statement. 
Made sure injected gcode always go in at the head.
Made sure we clear our current line before we send it to the printer.
 2014-04-07 14:04:38 -07:00
larsbrubaker
6831545af0 Adding in better temperature names for MatterSlice. 2014-04-07 13:30:13 -07:00
kevinepope
7d1d2e1e58 Work on SlicePreset configuration window. 2014-04-06 19:26:41 -07:00
kevinepope
90ed89cbba Material and Quantity pulldowns now show and store values correctly. 2014-04-06 19:25:58 -07:00
kevinepope
42defe3825 Renamed dropdown SelectedValue to SelectedLabel 2014-04-06 19:25:02 -07:00
kevinepope
84518e69c3 Add Material and Quality data values to PrinterProfile 2014-04-06 19:24:08 -07:00
kevinepope
cf5aeffe4b Move ContactForm actions to UiThread 2014-04-06 19:23:33 -07:00