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

4692 commits

This branch
This branch
All branches
Author SHA1 Message Date
Lars Brubaker
3e32347c88 Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-07-21 15:07:02 -07:00
Lars Brubaker
ecf3e085d1 Make sure we are checking PrinterSelected rather than ActiveSliceSettings.Instance == null 
The later does not happen anymore.
 2016-07-21 15:05:59 -07:00
Lars Brubaker
a2c6a57e5f Merge pull request #1157 from mmoening/master 
Load public profiles from Static Data before launching request to webserver in new task
 2016-07-21 14:59:51 -07:00
Matt Moening
97d3615755 Load public profiles from Static Data before launching request to web server in new task 
This reduced loading time for public profiles from 5200-5300ms to 2ms
Loadcacheable can now fall back to Static data if passed a path for it
 2016-07-21 14:23:35 -07:00
Lars Brubaker
6e0f9a0530 Merge pull request #1155 from larsbrubaker/master 
Don't try to connect when no printer selected.
 2016-07-21 13:52:16 -07:00
Lars Brubaker
e5c187c687 Show com port wizard on desktop when can't connect 
Don't show com port wizard when setting up a printer
Moved onload code (first draw) to ApplicationController
getting android to have the same wizard logic as desktop
Refactored setup wizard
 2016-07-21 13:49:22 -07:00
Lars Brubaker
d2d315ff9f Don't try to connect when no printer selected. 2016-07-21 10:18:30 -07:00
johnlewin
609baaf784 Merge pull request #1154 from jlewin/master 
Restore mattercontrol-test server, fix 500 errors
 2016-07-20 20:17:23 -07:00
John Lewin
0a14519748 Restore mattercontrol-test server, fix 500 errors 2016-07-20 20:13:36 -07:00
johnlewin
24316ae2d3 Merge pull request #1148 from jlewin/master 
Update Oem settings tests
 2016-07-20 20:11:36 -07:00
John Lewin
3ec400ee23 Revert prior workaround, explicitly create DB in dependent tests 2016-07-20 20:05:56 -07:00
John Lewin
7872f70299 Possible fix for build/test failures due to uninitialized DB 2016-07-20 19:31:26 -07:00
John Lewin
7a57093b3d Update Oem printer files to 1mm bottom_solid_layers 
- Remove FixNeeded category from BottomSolidLayersEqualsOneMM
 2016-07-20 18:32:17 -07:00
John Lewin
4d0fb6e67c Revise Oem settings tests 
- Remove no longer necessary LayerInfo class
 - Remove now redundant MaterialLayers, QualityLayers properties
 - Remove ConfigIni property
 - Remove unused functions
 - Refactor tests to receive a PrinterSettings param
 2016-07-20 18:32:17 -07:00
John Lewin
4cc03074da Remove setup.ini tests per issue #1138 2016-07-20 18:31:20 -07:00
John Lewin
98ee008046 Improve comments to better describe behavior 2016-07-20 18:31:20 -07:00
Lars Brubaker
b68441c443 Merge pull request #1153 from mmoening/master 
converted oemprofiles to be .printer files and to be retrieved as such from various locations.
 2016-07-20 18:23:47 -07:00
Matt Moening
d96531152b converted oemprofiles to be .printer files and to be retrieved as such from various locations. 
Updated to test to reflect the actions actually done by the request (not sure why they were not failing before)
 2016-07-20 17:39:19 -07:00
johnlewin
ecbb567c17 Merge pull request #1149 from larsbrubaker/master 
better default file name for export.
 2016-07-20 16:55:12 -07:00
Lars Brubaker
519f133cba better default file name for export. 2016-07-20 16:39:43 -07:00
johnlewin
cced82136b Merge pull request #1147 from gregory-diaz/master 
Added code to handle scenario where user switches to a printer profil…
 2016-07-20 15:39:44 -07:00
johnlewin
2fc5489dbc Merge pull request #1146 from larsbrubaker/master 
Made the override settings editors not change the data about the main…
 2016-07-20 15:39:28 -07:00
Greg
e5644b0e88 Added code to handle scenario where user switches to a printer profile that has been deleted from disk. Instead of loading an our default settings we download the missing profile instead. 2016-07-20 15:16:30 -07:00
Lars Brubaker
cd319c9040 Made the override settings editors not change the data about the main settings editor 2016-07-20 15:16:00 -07:00
Lars Brubaker
543a5a0c4f Merge pull request #1144 from larsbrubaker/master 
Fixed com port updating doing refresh.
 2016-07-20 14:54:02 -07:00
Lars Brubaker
59a6c2b0db Fixed com port updating doing refresh. 2016-07-20 13:53:37 -07:00
johnlewin
3434716f0e Merge pull request #1142 from mmoening/master 
Setupini test now run against .printer files
 2016-07-20 13:51:34 -07:00
Lars Brubaker
fcd15e91f0 Merge pull request #1143 from larsbrubaker/master 
Fixed the auto_connect setting
 2016-07-20 13:39:19 -07:00
Lars Brubaker
4c3b9e58f5 Fixed the auto_connect setting 2016-07-20 13:29:28 -07:00
Matt Moening
63e471d305 Setupini test now run against .printer files 2016-07-20 13:17:16 -07:00
johnlewin
edc7e13f3b Merge pull request #1135 from gregory-diaz/master 
Added the ability for users to load the last usable profile in their profile history in the event that their current profile is corrupt. Also added the ability to load a public profile in the event that a guest profile is corrupt.
 2016-07-20 12:34:30 -07:00
johnlewin
531152a93c Merge pull request #1136 from mmoening/master 
ConfigIniTest work with migrated .printer Files
 2016-07-20 10:19:49 -07:00
Matt Moening
b9f77ccf1c ConfigIniTest work with migrated .printer Files 2016-07-19 17:28:21 -07:00
Greg
e6a6abee72 Added the ability for users to load the last usable profile in their profile history in the event that their current profile is corrupt. Also added the ability to load a public profile in the event that a guest profile is corrupt. 2016-07-19 17:21:59 -07:00
Lars Brubaker
8bc55adb1a Merge pull request #1134 from larsbrubaker/master 
merg
 2016-07-19 15:31:43 -07:00
Greg
e4c30c80ca Added ability to recover from errors encountered when trying to load corrupted user and guest profiles. 2016-07-19 15:29:47 -07:00
Lars Brubaker
17f5a53297 Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-07-19 15:29:15 -07:00
Lars Brubaker
651c13631f Merge pull request #1132 from larsbrubaker/master 
Renamed SettingsProflie to SettingsHelpers
 2016-07-19 15:29:07 -07:00
Lars Brubaker
1a6feb85ae Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-07-19 13:41:13 -07:00
johnlewin
a6466b7ee3 Merge pull request #1130 from mmoening/master 
Switch to new .Printer Files
 2016-07-19 13:39:20 -07:00
Lars Brubaker
e5c617024a Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-07-19 13:29:04 -07:00
Lars Brubaker
451626504e Renamed SettingsProflie to SettingsHelpers 2016-07-19 13:28:10 -07:00
Greg
b08cb616e9 refactored recover user profile code so that it works with the changes to PrinterSettings that were pushed yesterday. 2016-07-19 13:27:20 -07:00
Matt Moening
55140a0a9f Remove StaticData/PrinterSettings 2016-07-19 13:19:44 -07:00
Matt Moening
0b919be893 Printer file commit 2016-07-19 13:19:44 -07:00
Lars Brubaker
eb416594a7 Merge pull request #1128 from mmoening/master 
Printer Settings defaults DocumentVersion to the lastest
 2016-07-19 13:13:25 -07:00
Matt Moening
8789c4681e Printer Settings defaults DocumentVersion to the lastest 
Serializing Printer setting now Ignores Helpers and PrinterSelected
 2016-07-19 12:50:04 -07:00
Lars Brubaker
08c39086b5 Merge pull request #1127 from larsbrubaker/master 
Making sure we only select MatterSlice when it is the only engine.
 2016-07-19 11:39:37 -07:00
Lars Brubaker
445f1560b0 Making sure we only select MatterSlice when it is the only engine. 
Keeping android building.
 2016-07-19 11:31:36 -07:00
Lars Brubaker
e9ae8f6e02 Merge pull request #1126 from unlimitedbacon/profiles 
Minor changes to M3D profile
 2016-07-19 11:04:08 -07:00