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

5726 commits

This branch
This branch
All branches
Author SHA1 Message Date
johnlewin
9bb75473ae Merge pull request #1714 from larsbrubaker/master 
Put in the action menus and controls.
 2016-12-08 16:17:49 -08:00
Lars Brubaker
d8d3e23522 Put in the action menus and controls. 2016-12-08 15:39:23 -08:00
Lars Brubaker
a9a5a9f476 Merge pull request #1708 from larsbrubaker/master 
Fixed merge error in test
 2016-12-07 17:16:11 -08:00
Lars Brubaker
3b526cdc98 Fixed merge error in test 
Make sure we don't ref a null mesh on rebuild bed
 2016-12-07 17:04:35 -08:00
Lars Brubaker
ba8f8b08d2 Merge pull request #1706 from larsbrubaker/master 
Only close if we don't need to select a printer
 2016-12-07 16:30:03 -08:00
Lars Brubaker
f4633a582f Fixed test 
Refactored to NumberOfHotEnds
 2016-12-07 16:26:35 -08:00
Lars Brubaker
dbd2c20398 Merge branch '1.6' 
# Conflicts:
#	SlicerConfiguration/Settings/ProfileManager.cs
#	Tests/MatterControl.AutomationTests/PrintQueueTests.cs
#	Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs
 2016-12-07 16:14:56 -08:00
Lars Brubaker
35c475b43a Make sure we close if multiple printers 2016-12-07 15:49:06 -08:00
Lars Brubaker
837c445e0b Fixed shared temp showing correct controls for multiple extruders. 2016-12-07 15:45:46 -08:00
Lars Brubaker
ea8f3a70a0 enable hardware as long as we are on internal machines. 2016-12-07 15:24:48 -08:00
Lars Brubaker
6d7b88b64e Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-12-07 15:23:33 -08:00
Lars Brubaker
38c6d488f4 Merge pull request #1705 from jlewin/master 
Add PrintLibraryItem test, suppress Process.Kill exceptions
 2016-12-07 15:23:05 -08:00
Lars Brubaker
0b88351365 Only close if we don't need to select a printer 2016-12-07 14:53:48 -08:00
John Lewin
12bfe38519 Validate PrinterConnectionAndCommunication active item matches 2016-12-07 14:34:23 -08:00
John Lewin
153686968f Add PrintLibraryItem test, suppress Process.Kill exceptions 2016-12-07 13:21:53 -08:00
johnlewin
ee7619dd77 Merge pull request #1704 from jlewin/master 
Adjust window width to ensure popout window -> Edit is targeted
 2016-12-07 12:12:08 -08:00
John Lewin
0d13eaef34 Adjust window width to ensure popout window -> Edit is targeted 2016-12-07 11:57:33 -08:00
Lars Brubaker
440c280e28 Merge pull request #1703 from larsbrubaker/master 
Fixed HasHeatedBedCheckedHidesBedTemperatureOptions
 2016-12-07 11:16:49 -08:00
Lars Brubaker
e89a1adad4 Fixed HasHeatedBedCheckedHidesBedTemperatureOptions 2016-12-07 11:10:35 -08:00
johnlewin
7435f7f3cc Merge pull request #1702 from jlewin/master 
Add 10 second timeout to WaitForReloadAll helper function
 2016-12-06 19:24:48 -08:00
John Lewin
37a9941c70 Add 10 second timeout to WaitForReloadAll helper function 2016-12-06 18:52:25 -08:00
Lars Brubaker
b0a8556a57 Merge pull request #1701 from larsbrubaker/master 
Quality settings override correctly.
 2016-12-06 18:20:47 -08:00
Lars Brubaker
5af8ce888d Merge branch 'Setting_Override_Correctly' 
# Conflicts:
#	SlicerConfiguration/SettingsControlSelectors.cs
 2016-12-06 18:17:45 -08:00
Lars Brubaker
054ba1c663 make sure we can go back to default (and test) 
change default to none
 2016-12-06 18:12:57 -08:00
Lars Brubaker
1e192d3cd0 Made a test to prove overrides persist on top of user overrides. 2016-12-06 17:54:27 -08:00
Lars Brubaker
83a3c87557 Quality settings override correctly. 2016-12-06 17:54:27 -08:00
Lars Brubaker
1bd0999352 Merge pull request #1699 from jlewin/master 
Ensure changes are persisted to disk and synced to the cloud
 2016-12-06 17:54:16 -08:00
John Lewin
b50cf8213c Ensure changes are persisted to disk and synced to the cloud 2016-12-06 16:56:37 -08:00
Lars Brubaker
c246f43f4f Quality settings override correctly. 2016-12-06 16:22:28 -08:00
johnlewin
f9fe5295de Merge pull request #1698 from larsbrubaker/master 
Fixed a bug when printing from library with new queue code
 2016-12-06 14:26:06 -08:00
Lars Brubaker
b94f9b4a2b latest agg 2016-12-06 14:16:24 -08:00
Lars Brubaker
cef4be50c2 Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-12-06 14:15:56 -08:00
Lars Brubaker
e3d4051189 Fixed a bug when printing from library with new queue code 2016-12-06 14:15:48 -08:00
Lars Brubaker
b32b44ce12 Merge pull request #1693 from jlewin/master 
Assert UserLayer is empty in production .printer files
 2016-12-05 18:56:28 -08:00
Lars Brubaker
d743485e00 Merge branch 'master' into master 2016-12-05 18:53:47 -08:00
Lars Brubaker
f494737643 Merge pull request #1694 from larsbrubaker/master 
guard against divide by 0.
 2016-12-05 18:03:56 -08:00
Lars Brubaker
f08183dad7 Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-12-05 17:58:16 -08:00
Lars Brubaker
b5e9c77933 Merge branch 'master' into master 2016-12-05 17:58:05 -08:00
Lars Brubaker
3b1ce39fb9 gaurd against divide by 0. 2016-12-05 17:19:15 -08:00
John Lewin
f19ffd5efe Use correct Assert method 2016-12-05 16:10:54 -08:00
John Lewin
716972896f Assert UserLayer is empty in production .printer files 2016-12-05 15:57:35 -08:00
Lars Brubaker
d364d4eff9 Merge pull request #1691 from jlewin/master 
Rewrite PrinterConfigTests to use .printer/PrinterSettings files
 2016-12-05 15:48:38 -08:00
Lars Brubaker
351fbbf9ec Merge branch 'master' into master 2016-12-05 15:44:17 -08:00
Lars Brubaker
ec4ede574e Merge pull request #1692 from larsbrubaker/master 
progress bar for heating
 2016-12-05 15:44:06 -08:00
John Lewin
57cfe64a5c Fix StaticData/Profiles path 2016-12-05 15:37:07 -08:00
Lars Brubaker
8733a73ab0 Better margin 2016-12-05 15:23:54 -08:00
John Lewin
755c7ac2aa Rewrite PrinterConfigTests to use .printer/PrinterSettings files 
- Migrate first_layer_speed to SettingsKey
- Use specialized Asserts to assist in troubleshooting
- Improve failure text to assist in troubleshooting
- Process all layers in .printer files
 2016-12-05 15:18:43 -08:00
Lars Brubaker
1876422bd9 Progress bar for temp and time. 2016-12-05 15:05:09 -08:00
johnlewin
900b492a4b Merge pull request #1689 from larsbrubaker/master 
Make sure the queue is passing all unit tests
 2016-12-05 12:07:14 -08:00
Lars Brubaker
c6d50d9907 Make sure the queue is passing all unit tests 
If single item selected add to array
Make sure we update selection visibility when going in and out of editor
Fixed some tests
 2016-12-05 11:55:08 -08:00