Commit graph

169 commits

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
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
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
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
98ee008046 Improve comments to better describe behavior 2016-07-20 18:31:20 -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
Lars Brubaker
519f133cba better default file name for export. 2016-07-20 16:39:43 -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
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
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
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
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
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
445f1560b0 Making sure we only select MatterSlice when it is the only engine.
Keeping android building.
2016-07-19 11:31:36 -07:00
John Lewin
215a27f79c Revert back to lazy loaded KnownSettings 2016-07-18 18:24:01 -07:00
John Lewin
80dab6c9e8 Make PrintLevelingChange event static
- Cleanup namespaces
 - Guard for null reference with null conditional invoke
2016-07-18 16:58:25 -07:00
John Lewin
85b2ddefc3 Rename PrintLevelingEnabled event 2016-07-18 16:58:25 -07:00
John Lewin
4ed3ac7c76 Update variable naming to match new type names 2016-07-18 16:58:25 -07:00
John Lewin
54d165d15f Consolidate member names 2016-07-18 16:58:25 -07:00
John Lewin
42f133aa70 Consolidate SettingsProfile and PrinterSettings types 2016-07-18 16:58:25 -07:00
John Lewin
f304e9f3d6 Migrate SettingsProfile functionality to new SettingsHelpers type
- Add as child property of settings scope, ready for merge of types
 - Progress on Issue #1113
2016-07-18 16:58:25 -07:00
Lars Brubaker
e39ad85d87 Make sure the profiles directory exists 2016-07-18 15:18:17 -07:00
Lars Brubaker
cc871edcb0 Merge pull request #1115 from gregory-diaz/master
Added notification that lets users know that the profile they are try…
2016-07-18 14:42:16 -07:00
Greg
c89a6ae8d5 Added notification that lets users know that the profile they are trying to load is corrupt and that we have loaded a usable public profile instead. 2016-07-18 13:48:08 -07:00
John Lewin
fe07d0b5c1 Replace OemProfile with PrinterSettings type
- Issue #1112
2016-07-18 11:58:54 -07:00
Lars Brubaker
a95fbdf109 Made the cost and mass fields update as settings are changed
Made only settings that require gcode to be rebuilt cause the hash code to change
2016-07-18 10:52:36 -07:00
Greg
b1b88c01de Added ability to recover a usable public profile in the event that we attempt to load a corrupt one. 2016-07-15 17:25:27 -07:00
Greg
73f396544c Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-07-15 17:23:21 -07:00
John Lewin
a6a8f65ebc Ensure the in memory instance ID changes when the profile ID changes 2016-07-15 13:32:49 -07:00
Lars Brubaker
b90b62528d Made it so we add the delete and update info for a printer as a new component
left aligned printer list (took out icon space)
2016-07-15 11:52:06 -07:00
Lars Brubaker
cec9a85435 Try to connect to printers that have auto connect enabled when they are selected
removed dead code
2016-07-14 17:07:04 -07:00
Greg
1115f05da0 Added Make and Model properties to PrinterInfo class and made sure that when we add a new printer, the Make and Model are written to {user}.json 2016-07-14 16:48:18 -07:00
Matt Moening
f8e00ca879 Made sure profiles use proper profile extension and are looked for accordingly
Fixed bug where we would show upload profile dialog without any profiles to upload
2016-07-14 13:46:33 -07:00
johnlewin
f5ce76e868 Merge pull request #1089 from larsbrubaker/master
Revised text for upload profiles window
2016-07-14 12:20:30 -07:00
John Lewin
dba57b3e0a Change printer profile extensions to '.printer'
- Convert string literals to shared const
2016-07-14 11:37:04 -07:00
Lars Brubaker
d681a01cf6 Merge 2016-07-14 11:19:13 -07:00
John Lewin
65d5b5505c Add option to ProfileManager to load Guest profile db
- Move SQLite import code into externally callable function
 - Add persistable property for PrintersImported to ProfileManager data
2016-07-13 17:22:02 -07:00
John Lewin
c2d87979c1 Call unregister event before changing instances 2016-07-13 17:22:02 -07:00
John Lewin
0d890a824e Better encapsulate profile path and filename logic from application
- Switch to unique file extension for user profile list (.profiles)
 - Use readonly property for Profile extensions
 - Add const for guest file name
2016-07-13 17:22:02 -07:00
John Lewin
b517e3e93f Prevent firing ActiveProfileModified on non-active profiles 2016-07-13 17:22:02 -07:00
Lars Brubaker
0df8886bef More tests
Validate that known settings are requested with the correct type passed to GetValue
Put in tests for extruder_count
2016-07-13 09:36:33 -07:00
Lars Brubaker
d8853e53f3 Merge pull request #1077 from larsbrubaker/master
Wrote a new test for first_layer_extrusion_width being parsed correctly
2016-07-12 18:14:38 -07:00
Lars Brubaker
3a9e4eb054 Wrote a new test for first_layer_extrusion_width being parsed correctly
Refactored first_layer_extrusion_width into a fixed string
2016-07-12 18:06:06 -07:00
John Lewin
da695dc581 Convert more string literals into SettingsKey constants 2016-07-12 17:51:26 -07:00
Lars Brubaker
fb5d2d9c6e Fixed a problem with first layer extrusion width not parsing correctly in new settings model 2016-07-12 16:43:39 -07:00
Matt Moening
469345e73f Async download of profiles not in cache
When creating a printer checks if profile is already on disk before downloading
2016-07-11 17:05:16 -07:00