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

5357 commits

This branch
This branch
All branches
Author SHA1 Message Date
Lars Brubaker
b659a3ea50 Make sure we clear z_offset_after_home on reset. 2016-10-18 15:58:50 -07:00
Lars Brubaker
b9249c2c3f Merge pull request #1504 from larsbrubaker/1.6.0 
Fixed a bug with wipe towers
 2016-10-18 11:55:57 -07:00
Lars Brubaker
a22093bfcf Write the current color into printers on creation. 2016-10-18 11:45:47 -07:00
Lars Brubaker
4b555f71c4 Fixed a bug with wipe towers 
Moving to 0,0
Not being inserted
 2016-10-18 11:31:39 -07:00
Lars Brubaker
94b384201d Merge pull request #1503 from mmoening/1.6.0 
Creating a new printer maintains the current color
 2016-10-18 11:27:43 -07:00
Matt Moening
a23b66e966 Creating a new printer maintains the current color 
- The color is also set as the printer's active theme
 2016-10-18 11:19:04 -07:00
johnlewin
eba3ef5fc2 Merge pull request #1502 from jlewin/1.6.0 
Ensure spawned process is killed along all codepaths
 2016-10-18 08:03:35 -07:00
John Lewin
18163f7cae Ensure spawned process is killed along all codepaths 
- No guarantee that all test method code will run
 2016-10-18 07:54:10 -07:00
johnlewin
8afce1dc0e Merge pull request #1500 from mmoening/1.6.0 
Fixed color behavior for users with unset default
 2016-10-17 13:25:59 -07:00
Matt Moening
6b586be835 Fixed color behavior for users with unset default 
-  When both the user and oem settings are unset we now both set the active theme color to be blue and set this as the user default
 - Removed redundant null check/fallback.
 2016-10-17 12:55:18 -07:00
Lars Brubaker
67615d681c Merge pull request #1499 from larsbrubaker/1.6.0 
Don't thow this in release.
 2016-10-17 12:49:12 -07:00
Lars Brubaker
05a14d6aa0 Merge branch '1.6.0' into 1.6.0 2016-10-17 12:43:44 -07:00
Lars Brubaker
ecce2e2b0d Don't thow this in release. 2016-10-17 12:40:19 -07:00
Lars Brubaker
2eb2bc7c8c Merge pull request #1498 from jlewin/1.6.0 
Explicitly set working directory for automation tests
 2016-10-17 11:41:30 -07:00
John Lewin
da19a6dc81 Use keyboard to manufacturer selection during test 
- Looks less broken
 2016-10-17 11:15:28 -07:00
John Lewin
aa6f2a539f Explicitly set working directory for automation tests 
- MatterSlice not found: IssueMatterHackers/MCCentral#612
 2016-10-17 11:15:28 -07:00
johnlewin
4b2c0740bb Merge pull request #1496 from jlewin/1.6.0 
Prevent invoke on SyncPrinterProfiles if null
 2016-10-15 12:42:30 -07:00
John Lewin
35a25c4957 Prevent invoke on SyncPrinterProfiles if null 2016-10-15 12:35:39 -07:00
Lars Brubaker
9e302320bb Merge pull request #1495 from larsbrubaker/1.6.0 
latest agg
 2016-10-14 14:55:01 -07:00
Lars Brubaker
2dfea23f90 latest agg 2016-10-14 14:47:11 -07:00
Lars Brubaker
82efe784e4 Merge pull request #1494 from larsbrubaker/1.6.0 
Wrote tests for LineIsZHoming
 2016-10-14 14:43:41 -07:00
Lars Brubaker
a3d4032704 Wrote tests for LineIsZHoming 
Made sure we don't clear leveling data while viewing.
 2016-10-14 13:15:09 -07:00
Lars Brubaker
a5bf0d7504 Disabling this until the scene bundle implementation. 2016-10-14 11:33:50 -07:00
Lars Brubaker
1d186f0d4d Merge pull request #1493 from larsbrubaker/1.6.0 
Make sure we clear the leveling before pushing new data
 2016-10-13 14:25:53 -07:00
Lars Brubaker
6ee93dc7f7 Make sure we clear the leveling before pushing new data 2016-10-13 14:18:53 -07:00
Lars Brubaker
e19f93b687 Merge pull request #1492 from larsbrubaker/1.6.0 
Removed interal leveling infor from visibility.
 2016-10-13 13:37:44 -07:00
Lars Brubaker
11575d8496 Removed interal leveling infor from visibility. 2016-10-13 13:34:01 -07:00
Lars Brubaker
59cd916b19 Merge pull request #1490 from larsbrubaker/1.6.0 
Don't apply the scale directly
 2016-10-12 17:57:59 -07:00
Lars Brubaker
a03b05cc1f Don't apply the scale directly 
now that we don't record the original size. Don't set this automatically.
 2016-10-12 17:50:08 -07:00
Lars Brubaker
aafc037582 updated me3d printer (also up in release data). 2016-10-12 16:55:02 -07:00
johnlewin
887bc7e50e Merge pull request #1489 from jlewin/master 
Prevent false positives when assemblies are missing
 2016-10-11 18:08:36 -07:00
John Lewin
01c6ed72a4 Revise comment and fix typo 2016-10-11 18:00:04 -07:00
John Lewin
2d5f177d87 Remove MCCentral assembly references 2016-10-11 17:49:57 -07:00
John Lewin
96bc8301f6 Add assert error message 2016-10-11 17:42:03 -07:00
John Lewin
1834221db5 Prevent false positives when assemblies are missing 
- Use the MatterControl output directory in all cases
- Only load assemblies for testing in Release builds
- Use conditional comp. for path resolution
 2016-10-11 17:28:16 -07:00
johnlewin
fd0b232deb Merge pull request #1488 from larsbrubaker/master 
Make it possible to have the print leveling go negative
 2016-10-11 15:22:29 -07:00
Lars Brubaker
567cefbc15 latest agg 2016-10-11 14:56:51 -07:00
Lars Brubaker
3bb439d198 Make it possible to have the print leveling go negative 
Took out the 2 point leveling solution
MatterHackers/MatterControl#804
 2016-10-11 14:56:36 -07:00
larsbrubaker
426c0ede6a Code to enable going below 0 for printe recovery 2016-10-10 19:30:48 -07:00
Lars Brubaker
ed0b271ddb Merge pull request #1487 from larsbrubaker/master 
Took out 3rd party ray gun library
 2016-10-10 17:09:30 -07:00
Lars Brubaker
be02602244 Took out 3rd party ray gun library 
Upgraded ray gun library
 2016-10-10 16:55:59 -07:00
Lars Brubaker
dc77544dca Don't run MS in process. 2016-10-10 15:23:22 -07:00
Lars Brubaker
6581566440 Merge pull request #1486 from larsbrubaker/master 
fixing colors
 2016-10-10 15:21:54 -07:00
Lars Brubaker
907f4306f6 fixing colors 2016-10-10 15:16:33 -07:00
Lars Brubaker
bf42c2a209 Merge pull request #1485 from larsbrubaker/master 
Made the colors get set early so we only have to load the main ui once.
 2016-10-10 14:19:47 -07:00
Lars Brubaker
89d7f7c41c Made the colors get set early so we only have to load the main ui once. 2016-10-10 14:15:16 -07:00
johnlewin
d8018fdfbc Merge pull request #1484 from larsbrubaker/master 
Fixed a bug in getting extruder temps
 2016-10-10 13:30:45 -07:00
Lars Brubaker
7712dab117 Merge branch 'master' into master 2016-10-10 13:06:17 -07:00
Lars Brubaker
70b411ad25 Merge pull request #1483 from mmoening/master 
Fix Regression in user color preservation
 2016-10-10 13:05:58 -07:00
Matt Moening
076619d0eb Fix Regression in user color preservation 
- Setting color for a printer sets value in user settings
 - use UserSetting color as default for loading theme color
 - if Active slice settings dont have an active theme set it to default
 - If user setting  theme is null attempt to load OemColor preference and set as user setting theme
 2016-10-10 12:55:14 -07:00